Merge branch 'main' of http://47.109.31.237:13000/lichunlei/mp-main into DuGuYang

AppStart/Helper/Profit/ProfitHelper.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Data;
 using MySystem.Models;
 using Library;
+using LitJson;
 using System.Threading;
 using Microsoft.Extensions.Hosting;
 using System.Threading.Tasks;
@@ -306,6 +307,7 @@ namespace MySystem
                                                     {
                                                         OutCount += 1;
                                                     }
+                                                    RedisDbconn.Instance.AddList("ConsumerOrdersSetDivi", "{\"OrderId\":\"" + suborder.Id + "\",\"DiviAmt\":\"" + suborder.CurDivi + "\"}");
                                                 }
                                             }
                                             else
@@ -2100,5 +2102,48 @@ namespace MySystem
         }
         #endregion
 
+
+
+
+
+
+
+        public void StartSetDivi()
+        {
+            Thread th = new Thread(StartSetDiviDo);
+            th.IsBackground = true;
+            th.Start();
+        }
+        public void StartSetDiviDo()
+        {
+            while (true)
+            {
+                string content = RedisDbconn.Instance.RPop<string>("ConsumerOrdersSetDivi");
+                if (!string.IsNullOrEmpty(content))
+                {
+                    SetDivi(content);
+                }
+                else
+                {
+                    Thread.Sleep(10000);
+                }
+            }
+        }
+
+        public void SetDivi(string content)
+        { 
+            JsonData jsonObj = JsonMapper.ToObject(content);
+            int orderId = int.Parse(jsonObj["OrderId"].ToString());
+            decimal diviAmt = int.Parse(jsonObj["DiviAmt"].ToString());
+            WebCMSEntities db = new WebCMSEntities();
+            ConsumerOrders order = db.ConsumerOrders.FirstOrDefault(m => m.Id == orderId);
+            if(order != null)
+            {
+                order.CurDivi = diviAmt;
+                db.SaveChanges();
+            }
+            db.Dispose();
+        }
+
     }
 }

AppStart/Helper/ProfitShareService.cs

@@ -58,7 +58,7 @@ namespace MySystem
                         if (order != null)
                         {
                             order.DivideLog = "分账审核结果：" + result;
-                            order.DivideFlag = 1;
+                            order.DivideFlag = 2;
                             db.SaveChanges();
                             RedisDbconn.Instance.AddList("ConsumerOrders:Divi:" + order.PayMode + ":List", order.Id.ToString());
                             // RedisDbconn.Instance.AddRightList("ConsumerOrders:Divi:" + order.PayMode + ":" + order.MerchantId, order);

Startup.cs

@@ -188,6 +188,7 @@ namespace MySystem
                 // ProfitHelper.Instance.StartActive(); //发放达标奖励队列
                 ProfitHelper.Instance.StartListenTrade(); //支付宝返现队列
                 ProfitHelper.Instance.StartListenWxTrade(); //微信返现队列
+                ProfitHelper.Instance.StartSetDivi(); //设置订单当前返现金额
                 ProfitShareService.Instance.Start(); //分账状态监控队列，分账完成则提交返现（微信）
                 AlipayShareService.Instance.Start(); //分账状态监控队列，分账完成则提交返现（支付宝）
                 WeChatPayBackService.Instance.StartDivi(); //补分账

global.json

@@ -0,0 +1,5 @@
+{
+  "sdk": {
+    "version": "3.0.100"
+  }
+}