测试来客吧分润

AppStart/Helper/Profit/ProfitHelper.cs

@@ -393,52 +393,42 @@ namespace MySystem
                 {
                     foreach (ProfitResult sub in list)
                     {
-                        if (sub.Message == "分红奖励")
-                        { 
-                            UserAccountRecord accountRecord = dbnew.UserAccountRecord.Add(new UserAccountRecord()
+                        int ProfitType = sub.UserId == UserId ? 0 : 1;
+                        ProfitRewardRecord editprofitrecord = dbnew.ProfitRewardRecord.FirstOrDefault(m => m.UserId == sub.UserId && m.BrandId == 1 && m.ProfitType == ProfitType && m.TradeMonth == TradeMonth);
+                        if (editprofitrecord == null)
+                        {
+                            editprofitrecord = dbnew.ProfitRewardRecord.Add(new ProfitRewardRecord()
                             {
                                 CreateDate = DateTime.Now,
-                                UpdateDate = DateTime.Now,
                                 UserId = sub.UserId, //创客
-                                ChangeType = 11, //变动类型
-                                ProductType = 1, //产品类型
-                                ChangeAmount = sub.Money, //变更金额
-                                Status = -1,
+                                BrandId = 1, //品牌
+                                ProfitType = ProfitType, //创客分润类型
+                                TradeMonth = TradeMonth, //交易月
+                                TopUserId = TopUserId, //顶级创客
                             }).Entity;
                             dbnew.SaveChanges();
-                        }
-                        else
-                        {
-                            int ProfitType = sub.UserId == UserId ? 0 : 1;
-                            ProfitRewardRecord editprofitrecord = dbnew.ProfitRewardRecord.FirstOrDefault(m => m.UserId == sub.UserId && m.BrandId == 1 && m.ProfitType == ProfitType && m.TradeMonth == TradeMonth);
-                            if (editprofitrecord == null)
+                            string RecordNo = "KPM";
+                            int RecordId = editprofitrecord.Id;
+                            string RecordIdString = RecordId.ToString();
+                            for (int i = 0; i < 14 - RecordId.ToString().Length; i++)
                             {
-                                editprofitrecord = dbnew.ProfitRewardRecord.Add(new ProfitRewardRecord()
-                                {
-                                    CreateDate = DateTime.Now,
-                                    UserId = sub.UserId, //创客
-                                    BrandId = 1, //品牌
-                                    ProfitType = ProfitType, //创客分润类型
-                                    TradeMonth = TradeMonth, //交易月
-                                    TopUserId = TopUserId, //顶级创客
-                                }).Entity;
-                                dbnew.SaveChanges();
-                                string RecordNo = "KPM";
-                                int RecordId = editprofitrecord.Id;
-                                string RecordIdString = RecordId.ToString();
-                                for (int i = 0; i < 14 - RecordId.ToString().Length; i++)
-                                {
-                                    RecordIdString = "0" + RecordIdString;
-                                }
-                                RecordNo += RecordIdString;
-                                editprofitrecord.RecordNo = RecordNo;
-                                dbnew.SaveChanges();
+                                RecordIdString = "0" + RecordIdString;
                             }
-                            editprofitrecord.TradeAmt += TotalAmount; //商户交易总额
-                            editprofitrecord.DebitCapTradeNum += 1; //商户借记卡封顶交易总笔数
-                            decimal ProfitMoney = sub.Money;
+                            RecordNo += RecordIdString;
+                            editprofitrecord.RecordNo = RecordNo;
                             dbnew.SaveChanges();
                         }
+                        if(IsActive)
+                        {
+                            editprofitrecord.CreditTradeAmt += TotalAmount;
+                            editprofitrecord.CreditTradeProfit += sub.Money;
+                        }
+                        else
+                        {
+                            editprofitrecord.TradeAmt += TotalAmount;
+                            editprofitrecord.TradeProfit += sub.Money;
+                        }
+                        dbnew.SaveChanges();
                     }
                     dbnew.SaveChanges();
                 }

Startup.cs

@@ -171,23 +171,23 @@ namespace MySystem
             });
 
             //必须打开的
-            // MerchantConfirmService.Instance.Start(); //特约商户进件队列
-            // CheckAlipaySignService.Instance.Start(); //特约商户签约队列（支付宝）
-            // CheckWeChatSignService.Instance.Start(); //特约商户签约队列（微信）
-            // AlipayPayBackService.Instance.Start(); //支付宝支付回调队列
-            // AlipayPayBackService.Instance.StartProfitShare(); //监听已支付订单，超过1分钟的订单执行分账
-            // WeChatPayBackService.Instance.Start(); //微信支付回调队列
-            // WeChatPayBackService.Instance.StartProfitShare(); //监听已支付订单，超过1分钟的订单执行分账
-            // ProfitHelper.Instance.StartActive(); //发放达标奖励队列
-            // ProfitHelper.Instance.StartListenTrade(); //支付宝返现队列
-            // ProfitHelper.Instance.StartListenWxTrade(); //微信返现队列
-            // ProfitShareService.Instance.Start(); //分账状态监控队列，分账完成则提交返现（微信）
-            // AlipayShareService.Instance.Start(); //分账状态监控队列，分账完成则提交返现（支付宝）
+            MerchantConfirmService.Instance.Start(); //特约商户进件队列
+            CheckAlipaySignService.Instance.Start(); //特约商户签约队列（支付宝）
+            CheckWeChatSignService.Instance.Start(); //特约商户签约队列（微信）
+            AlipayPayBackService.Instance.Start(); //支付宝支付回调队列
+            AlipayPayBackService.Instance.StartProfitShare(); //监听已支付订单，超过1分钟的订单执行分账
+            WeChatPayBackService.Instance.Start(); //微信支付回调队列
+            WeChatPayBackService.Instance.StartProfitShare(); //监听已支付订单，超过1分钟的订单执行分账
+            ProfitHelper.Instance.StartActive(); //发放达标奖励队列
+            ProfitHelper.Instance.StartListenTrade(); //支付宝返现队列
+            ProfitHelper.Instance.StartListenWxTrade(); //微信返现队列
+            ProfitShareService.Instance.Start(); //分账状态监控队列，分账完成则提交返现（微信）
+            AlipayShareService.Instance.Start(); //分账状态监控队列，分账完成则提交返现（支付宝）
             //必须打开的
 
 
 
-            ProfitHelper.Instance.StartListenProfit();
+            // ProfitHelper.Instance.StartListenProfit();
         }
     }
 }