From 5f4384bdab4697cc0a678fb17e55603a91a4750b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 12 四月 2024 08:44:54 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/baifenbaishop
---
CoreCms.Net.RedisMQ/OrderAgentOrDistributionSubscribe.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/CoreCms.Net.RedisMQ/OrderAgentOrDistributionSubscribe.cs b/CoreCms.Net.RedisMQ/OrderAgentOrDistributionSubscribe.cs
index 658deb0..3d0309c 100644
--- a/CoreCms.Net.RedisMQ/OrderAgentOrDistributionSubscribe.cs
+++ b/CoreCms.Net.RedisMQ/OrderAgentOrDistributionSubscribe.cs
@@ -2,6 +2,7 @@
using System.Threading.Tasks;
using CoreCms.Net.Configuration;
using CoreCms.Net.IServices;
+using CoreCms.Net.IServices.baifenbingfa;
using CoreCms.Net.Loging;
using CoreCms.Net.Model.Entities;
using CoreCms.Net.Model.ViewModels.UI;
@@ -29,8 +30,10 @@
private readonly ICoreCmsUserServices _userServices;
private readonly ICoreCmsAgentOrderServices _agentOrderServices;
+ private readonly IBfbfComAPIService _bfbfComAPIService;
- public OrderAgentOrDistributionSubscribe(ICoreCmsBillPaymentsServices billPaymentsServices, ICoreCmsDistributionOrderServices distributionOrderServices, ICoreCmsDistributionServices distributionServices, ICoreCmsSettingServices settingServices, ICoreCmsUserServices userServices, ICoreCmsAgentOrderServices agentOrderServices)
+
+ public OrderAgentOrDistributionSubscribe(ICoreCmsBillPaymentsServices billPaymentsServices, ICoreCmsDistributionOrderServices distributionOrderServices, ICoreCmsDistributionServices distributionServices, ICoreCmsSettingServices settingServices, ICoreCmsUserServices userServices, ICoreCmsAgentOrderServices agentOrderServices ,IBfbfComAPIService bfbfComAPIService)
{
_billPaymentsServices = billPaymentsServices;
_distributionOrderServices = distributionOrderServices;
@@ -38,6 +41,8 @@
_settingServices = settingServices;
_userServices = userServices;
_agentOrderServices = agentOrderServices;
+ _bfbfComAPIService= bfbfComAPIService;
+
}
/// <summary>
@@ -77,8 +82,11 @@
var jm = await _distributionOrderServices.AddData(order); //娣诲姞鍒嗕韩鍏宠仈璁㈠崟鏃ュ織
//鍒ゆ柇鏄惁鍙互鎴愪负缁忛攢鍟�
//鍏堝垽鏂槸鍚﹀凡缁忔槸缁忛攢鍟嗕簡銆�
+ //鐧惧垎鍏垫硶鍚屾剰鍒ゅ喅缁忛攢鍟�
bool check = await _distributionServices.ExistsAsync(p => p.userId == order.userId);
- var distributionType = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionType).ObjectToInt(0);
+ //bool check = await _bfbfComAPIService.IsDictionary( order.userId);
+
+ var distributionType = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionType).ObjectToInt(0);
if (distributionType == 3) //鏃犻渶瀹℃牳锛屼絾鏄婊¤冻鎻愪氦
{
var info = new CoreCmsDistribution();
--
Gitblit v1.9.1