添加临时补返现方法

Controllers/HomeController.cs

@@ -257,36 +257,36 @@ namespace MySystem.Controllers
             //     });
             // }
 
-            Models.Main1.WebCMSEntities db1 = new Models.Main1.WebCMSEntities();
-            WebCMSEntities db = new WebCMSEntities();
-            MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == 1147);
-            MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == 1147);
-            string pwd = "417027";
-            merchant.LoginPwd = function.MD532(pwd);
-            Models.Main1.MerchantLoginInfo info = db1.MerchantLoginInfo.FirstOrDefault(m => m.LoginMobile == merchantadd.MobilePhone);
-            if (info == null)
-            {
-                info = db1.MerchantLoginInfo.Add(new Models.Main1.MerchantLoginInfo()
-                {
-                    LoginMobile = merchantadd.MobilePhone,
-                }).Entity;
-                db1.SaveChanges();
-            }
-            info.LoginPwd = function.MD532(pwd);
-            db1.SaveChanges();
-            Models.Main1.MerchantAccountLinkInfo infolink = db1.MerchantAccountLinkInfo.FirstOrDefault(m => m.LoginId == info.Id && m.MerchantId == merchantadd.Id && m.Kind == 2);
-            if (infolink == null)
-            {
-                infolink = db1.MerchantAccountLinkInfo.Add(new Models.Main1.MerchantAccountLinkInfo()
-                {
-                    LoginId = info.Id,
-                    MerchantId = merchantadd.Id,
-                    Kind = 2,
-                }).Entity;
-                db1.SaveChanges();
-            }
-            db1.Dispose();
-            db.Dispose();
+            // Models.Main1.WebCMSEntities db1 = new Models.Main1.WebCMSEntities();
+            // WebCMSEntities db = new WebCMSEntities();
+            // MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == 1147);
+            // MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == 1147);
+            // string pwd = "417027";
+            // merchant.LoginPwd = function.MD532(pwd);
+            // Models.Main1.MerchantLoginInfo info = db1.MerchantLoginInfo.FirstOrDefault(m => m.LoginMobile == merchantadd.MobilePhone);
+            // if (info == null)
+            // {
+            //     info = db1.MerchantLoginInfo.Add(new Models.Main1.MerchantLoginInfo()
+            //     {
+            //         LoginMobile = merchantadd.MobilePhone,
+            //     }).Entity;
+            //     db1.SaveChanges();
+            // }
+            // info.LoginPwd = function.MD532(pwd);
+            // db1.SaveChanges();
+            // Models.Main1.MerchantAccountLinkInfo infolink = db1.MerchantAccountLinkInfo.FirstOrDefault(m => m.LoginId == info.Id && m.MerchantId == merchantadd.Id && m.Kind == 2);
+            // if (infolink == null)
+            // {
+            //     infolink = db1.MerchantAccountLinkInfo.Add(new Models.Main1.MerchantAccountLinkInfo()
+            //     {
+            //         LoginId = info.Id,
+            //         MerchantId = merchantadd.Id,
+            //         Kind = 2,
+            //     }).Entity;
+            //     db1.SaveChanges();
+            // }
+            // db1.Dispose();
+            // db.Dispose();
 
             return "ok";
         }
@@ -294,18 +294,35 @@ namespace MySystem.Controllers
         
         public string clearQueue(int OrderId, int MerchantId, int PayMode)
         {
-            List<ConsumerOrders> list = RedisDbconn.Instance.GetList<ConsumerOrders>("ConsumerOrdersHd:Divi:" + PayMode + ":" + MerchantId + "", 1, 100000);
-            foreach(ConsumerOrders sub in list)
+            // List<ConsumerOrders> list = RedisDbconn.Instance.GetList<ConsumerOrders>("ConsumerOrdersHd:Divi:" + PayMode + ":" + MerchantId + "", 1, 100000);
+            // foreach(ConsumerOrders sub in list)
+            // {
+            //     if(sub.Id == OrderId)
+            //     {
+            //         RedisDbconn.Instance.DelFromList("ConsumerOrdersHd:Divi:2:1272", sub);
+            //     }
+            // }
+            return "ok";
+        }
+    
+    
+        //补返现
+        public string back(string no)
+        {
+            WebCMSEntities db = new WebCMSEntities();
+            ConsumerOrders order = db.ConsumerOrders.FirstOrDefault(m => m.OrderNo == no);
+            if(order != null)
             {
-                if(sub.Id == OrderId)
+                List<ConsumerOrders> list = RedisDbconn.Instance.GetList<ConsumerOrders>("ConsumerOrdersHd:Divi:" + order.PayMode + ":" + order.MerchantId + "", 1, 100000);
+                ConsumerOrders check = list.FirstOrDefault(m => m.Id == order.Id);
+                bool op = db.ConsumerProfit.Any(m => m.OrderId == order.Id);
+                if(check == null && !op)
                 {
-                    RedisDbconn.Instance.DelFromList("ConsumerOrdersHd:Divi:2:1272", sub);
+                    RedisDbconn.Instance.AddList("ConsumerOrdersHd:Divi:" + order.PayMode + ":List", order.Id.ToString());
                 }
+                db.Dispose();
             }
             return "ok";
         }
-    
-    
-    
     }
 }

Startup.cs

@@ -142,36 +142,36 @@ namespace MySystem
             }
             if(Library.ConfigurationManager.EnvironmentFlag == 2)
             {
-                MerchantConfirmService.Instance.Start(); //提交商户进件
-                CheckWeChatSignService.Instance.Start(); //查询商户审核状态
-                CheckWeChatBindService.Instance.Start(); //执行好哒微信绑定appid
-                ProfitShareService.Instance.Start(); //分账状态监控队列，分账完成则提交返现
-                HaoDaExtHelper.Instance.StartWeChat();
-                HaoDaExtHelper.Instance.StartAlipay();
-                HaoDaExtQueryHelper.Instance.StartWeChat();
-                HaoDaExtQueryHelper.Instance.StartAlipay();
-                HaoDaExtQueryAuthHelper.Instance.StartWeChat();
-                HaoDaExtQueryAuthHelper.Instance.StartAlipay();
-                HaoDaAuthQueryHelper.Instance.Start(); //查询实名认证状态
-                WeChatPayBackService.Instance.Start(); //支付回调
-                WeChatPayBackService.Instance.StartProfitShare(); //分账队列
-                WeChatPayBackService.Instance.StartSettleOrder(); //接收分账结算金额
-                WeChatPayBackService.Instance.StartDivi(); //补分账
-                ProfitHelper.Instance.StartListenTrade(); //返现队列-支付宝
-                ProfitHelper.Instance.StartListenWxTrade(); //返现队列-微信
-                ProfitHelper.Instance.StartSetDivi(); //设置订单当前返现金额
-                ProfitHelper.Instance.StartListenProfit(); //每月分润
-                ProfitCheckHelper.Instance.Start(); //检查订单是否在队列里
+                // MerchantConfirmService.Instance.Start(); //提交商户进件
+                // CheckWeChatSignService.Instance.Start(); //查询商户审核状态
+                // CheckWeChatBindService.Instance.Start(); //执行好哒微信绑定appid
+                // ProfitShareService.Instance.Start(); //分账状态监控队列，分账完成则提交返现
+                // HaoDaExtHelper.Instance.StartWeChat();
+                // HaoDaExtHelper.Instance.StartAlipay();
+                // HaoDaExtQueryHelper.Instance.StartWeChat();
+                // HaoDaExtQueryHelper.Instance.StartAlipay();
+                // HaoDaExtQueryAuthHelper.Instance.StartWeChat();
+                // HaoDaExtQueryAuthHelper.Instance.StartAlipay();
+                // HaoDaAuthQueryHelper.Instance.Start(); //查询实名认证状态
+                // WeChatPayBackService.Instance.Start(); //支付回调
+                // WeChatPayBackService.Instance.StartProfitShare(); //分账队列
+                // WeChatPayBackService.Instance.StartSettleOrder(); //接收分账结算金额
+                // WeChatPayBackService.Instance.StartDivi(); //补分账
+                // ProfitHelper.Instance.StartListenTrade(); //返现队列-支付宝
+                // ProfitHelper.Instance.StartListenWxTrade(); //返现队列-微信
+                // ProfitHelper.Instance.StartSetDivi(); //设置订单当前返现金额
+                // ProfitHelper.Instance.StartListenProfit(); //每月分润
+                // ProfitCheckHelper.Instance.Start(); //检查订单是否在队列里
 
-                AlipayPayBackFeeService.Instance.Start();
-                ActiveRewardService.Instance.StartAct();
-                ActiveRewardService.Instance.StartOpenReward();
-                ActiveRewardService.Instance.StartLeaderReward();
-                ActiveRewardService.Instance.StartOperateReward();
+                // AlipayPayBackFeeService.Instance.Start();
+                // ActiveRewardService.Instance.StartAct();
+                // ActiveRewardService.Instance.StartOpenReward();
+                // ActiveRewardService.Instance.StartLeaderReward();
+                // ActiveRewardService.Instance.StartOperateReward();
                 
-                MerchantStandardService.Instance.Start(); //商户缴纳服务费次月活动交易额大于等于1W，奖励进件创客50元
-                MerchantStandardService.Instance.StartThree(); //商户缴纳服务费次月起连续不间断三个月，每月活动交易额大于1W，奖励进件创客100元
-                MerchantStandardService.Instance.StartActive();
+                // MerchantStandardService.Instance.Start(); //商户缴纳服务费次月活动交易额大于等于1W，奖励进件创客50元
+                // MerchantStandardService.Instance.StartThree(); //商户缴纳服务费次月起连续不间断三个月，每月活动交易额大于1W，奖励进件创客100元
+                // MerchantStandardService.Instance.StartActive();
             }
         }