Explorar el Código

支付回调保存payChannelOrderNo字段

lcl hace 1 año
padre
commit
3563c002c0
Se han modificado 2 ficheros con 42 adiciones y 36 borrados
  1. 34 34
      Startup.cs
  2. 8 2
      Util/HaoDa/WeChatPayBackService.cs

+ 34 - 34
Startup.cs

@@ -135,42 +135,42 @@ namespace MySystem
             });
 
             initMainServer();
-            // if(Library.ConfigurationManager.EnvironmentFlag == 1)
-            // {
-            //     TestHaoDaService.Instance.Start(); //好哒测试
-            //     // MerchantStandardService.Instance.Start();
-            // }
-            // 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.StartListenProfit(); //每月分润
+            if(Library.ConfigurationManager.EnvironmentFlag == 1)
+            {
+                TestHaoDaService.Instance.Start(); //好哒测试
+                // MerchantStandardService.Instance.Start();
+            }
+            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.StartListenProfit(); //每月分润
 
-            //     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();
+            }
         }
 
         //初始化数据结构

+ 8 - 2
Util/HaoDa/WeChatPayBackService.cs

@@ -55,7 +55,12 @@ namespace MySystem
             if (jsonObj.Count > 0)
             {
                 string OrderNo = jsonObj["outOrderNo"].ToString();
-                string TradeNo = jsonObj["orderNo"].ToString();
+                string HdOrderNo = jsonObj["orderNo"].ToString();
+                string TradeNo = "";
+                if(content.Contains("\"payChannelOrderNo\""))
+                {
+                    TradeNo = jsonObj["payChannelOrderNo"].ToString();
+                }
                 WebCMSEntities db = new WebCMSEntities();
                 ConsumerOrders order = db.ConsumerOrders.FirstOrDefault(m => m.OrderNo == OrderNo && m.Status == 0);
                 if (order != null)
@@ -64,7 +69,8 @@ namespace MySystem
                     order.UpdateDate = DateTime.Now;
                     order.PayMoney = order.PayMoney;
                     order.MaxDivi = order.MaxDivi;
-                    order.SeoTitle = TradeNo;
+                    order.SeoTitle = HdOrderNo;
+                    order.SeoKeyword = TradeNo;
                     MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == order.MerchantId) ?? new MerchantInfo();
                     MerchantAddInfo addinfo = db.MerchantAddInfo.FirstOrDefault(m => m.Id == order.MerchantId) ?? new MerchantAddInfo();
                     if(addinfo.Status == 1 && order.PayMode == 2)