From 557c2711a3e103ebc3d0492344eca9730d5e92b2 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期一, 17 二月 2025 10:47:47 +0800
Subject: [PATCH] 增加司机配送单超时处理任务,防止一直不停手机定位信息,

---
 CoreCms.Net.RedisMQ/OrderAgentOrDistributionSubscribe.cs |   27 +++++++++++++++++----------
 1 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/CoreCms.Net.RedisMQ/OrderAgentOrDistributionSubscribe.cs b/CoreCms.Net.RedisMQ/OrderAgentOrDistributionSubscribe.cs
index b5112dc..74357e5 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;
@@ -17,7 +18,7 @@
 namespace CoreCms.Net.RedisMQ
 {
     /// <summary>
-    /// 璁㈠崟瀹岀粨鍚庤蛋浠g悊鎴栧垎閿�鍟嗘彁鎴愬鐞�
+    /// 璁㈠崟瀹岀粨鍚庤蛋浠g悊鎴栫粡閿�鍟嗘彁鎴愬鐞�
     /// </summary>
     public class OrderAgentOrDistributionSubscribe : IRedisSubscribe
     {
@@ -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,10 +41,12 @@
             _settingServices = settingServices;
             _userServices = userServices;
             _agentOrderServices = agentOrderServices;
+            _bfbfComAPIService= bfbfComAPIService;
+
         }
 
         /// <summary>
-        /// 璁㈠崟瀹岀粨鍚庤蛋浠g悊鎴栧垎閿�鍟嗘彁鎴愬鐞�
+        /// 璁㈠崟瀹岀粨鍚庤蛋浠g悊鎴栫粡閿�鍟嗘彁鎴愬鐞�
         /// </summary>
         /// <param name="msg"></param>
         /// <returns></returns>
@@ -75,14 +80,17 @@
                         case (int)GlobalEnumVars.CommissionChannel.浠呭垎閿� when openDistribution == 1:
                         {
                             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();
-                                //鍒ゆ柇鏄惁鍒嗛攢鍟�
+                                //鍒ゆ柇鏄惁缁忛攢鍟�
                                 if (check == false)
                                 {
                                     await _distributionServices.CheckCondition(allConfigs, info, order.userId);
@@ -121,14 +129,14 @@
                             }
 
                             await _distributionOrderServices.AddData(order); //娣诲姞鍒嗕韩鍏宠仈璁㈠崟鏃ュ織
-                            //鍒ゆ柇鏄惁鍙互鎴愪负鍒嗛攢鍟�
+                            //鍒ゆ柇鏄惁鍙互鎴愪负缁忛攢鍟�
                             //鍏堝垽鏂槸鍚﹀凡缁忔槸缁忛攢鍟嗕簡銆�
                             bool check = await _distributionServices.ExistsAsync(p => p.userId == order.userId);
                             var distributionType = CommonHelper.GetConfigDictionary(allConfigs, SystemSettingConstVars.DistributionType).ObjectToInt(0);
                             if (distributionType == 3)  //鏃犻渶瀹℃牳锛屼絾鏄婊¤冻鎻愪氦
                             {
                                 var info = new CoreCmsDistribution();
-                                //鍒ゆ柇鏄惁鍒嗛攢鍟�
+                                //鍒ゆ柇鏄惁缁忛攢鍟�
                                 if (check == false)
                                 {
                                     await _distributionServices.CheckCondition(allConfigs, info, order.userId);
@@ -142,7 +150,6 @@
                                         iData.name = !string.IsNullOrEmpty(user.nickName) ? user.nickName : user.mobile;
                                         iData.verifyStatus = (int)GlobalEnumVars.DistributionVerifyStatus.VerifyYes;
                                         iData.verifyTime = DateTime.Now;
-
                                         await _distributionServices.AddData(iData, order.userId);
                                     }
                                 }
@@ -167,7 +174,7 @@
                                 if (distributionType == 3)  //鏃犻渶瀹℃牳锛屼絾鏄婊¤冻鎻愪氦
                                 {
                                     var info = new CoreCmsDistribution();
-                                    //鍒ゆ柇鏄惁鍒嗛攢鍟�
+                                    //鍒ゆ柇鏄惁缁忛攢鍟�
                                     if (check == false)
                                     {
                                         await _distributionServices.CheckCondition(allConfigs, info, order.userId);

--
Gitblit v1.9.1