支付宝已冻结状态并且有二维码，设为待签约

支付成功，待签约商户设置为已签约

Startup.cs

@@ -135,19 +135,25 @@ namespace MySystem
             });
 
             initMainServer();
-            MerchantConfirmService.Instance.Start(); //提交商户进件
-            CheckWeChatSignService.Instance.Start(); //查询商户审核状态
-            ProfitShareService.Instance.Start(); //分账状态监控队列，分账完成则提交返现
-            HaoDaExtHelper.Instance.StartWeChat();
-            HaoDaExtHelper.Instance.StartAlipay();
-            HaoDaExtQueryHelper.Instance.StartWeChat();
-            HaoDaExtQueryHelper.Instance.StartAlipay();
-            HaoDaAuthQueryHelper.Instance.Start(); //查询实名认证状态
-            WeChatPayBackService.Instance.Start(); //支付回调
-            WeChatPayBackService.Instance.StartProfitShare(); //分账队列
-            ProfitHelper.Instance.StartListenTrade(); //返现队列-支付宝
-            ProfitHelper.Instance.StartListenWxTrade(); //返现队列-微信
-            // TestHaoDaService.Instance.Start(); //好哒测试
+            if(Library.ConfigurationManager.EnvironmentFlag == 1)
+            {
+                TestHaoDaService.Instance.Start(); //好哒测试
+            }
+            if(Library.ConfigurationManager.EnvironmentFlag == 2)
+            {
+                MerchantConfirmService.Instance.Start(); //提交商户进件
+                CheckWeChatSignService.Instance.Start(); //查询商户审核状态
+                ProfitShareService.Instance.Start(); //分账状态监控队列，分账完成则提交返现
+                HaoDaExtHelper.Instance.StartWeChat();
+                HaoDaExtHelper.Instance.StartAlipay();
+                HaoDaExtQueryHelper.Instance.StartWeChat();
+                HaoDaExtQueryHelper.Instance.StartAlipay();
+                HaoDaAuthQueryHelper.Instance.Start(); //查询实名认证状态
+                WeChatPayBackService.Instance.Start(); //支付回调
+                WeChatPayBackService.Instance.StartProfitShare(); //分账队列
+                ProfitHelper.Instance.StartListenTrade(); //返现队列-支付宝
+                ProfitHelper.Instance.StartListenWxTrade(); //返现队列-微信
+            }
         }
 
         //初始化数据结构

Util/HaoDa/HaoDaExtQueryHelper.cs

@@ -139,6 +139,7 @@ public class HaoDaExtQueryHelper
             {
                 LogHelper.Instance.WriteLog("starts", "查询支付宝商户意愿申请状态");
                 string order_status = jsonObj["alipay_merchant_indirect_authorder_querystatus_response"]["order_status"].ToString();
+                LogHelper.Instance.WriteLog(order_status, "查询支付宝商户意愿申请状态");
                 if (order_status == "CONTACT_CONFIRM")
                 {
                     LogHelper.Instance.WriteLog("start1", "查询支付宝商户意愿申请状态");
@@ -153,11 +154,21 @@ public class HaoDaExtQueryHelper
                 }
                 else if (order_status == "AUDIT_FREEZE")
                 {
-                    LogHelper.Instance.WriteLog("start2", "查询支付宝商户意愿申请状态");
                     MerchantInfo merchant = db.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantInfo();
-                    info.QueryCount = -1;
-                    merchant.QueryCount = -1;
-                    info.AlipayRemark = jsonObj["alipay_merchant_indirect_authorder_querystatus_response"]["msg"].ToString();
+                    LogHelper.Instance.WriteLog("start2", "查询支付宝商户意愿申请状态");
+                    if(result.Contains("\"qr_code\":"))
+                    {
+                        info.QueryCount = 1;
+                        merchant.QueryCount = 1;
+                        info.AlipayRemark = "";
+                        info.AlipaySignUrl = jsonObj["alipay_merchant_indirect_authorder_querystatus_response"]["qr_code"].ToString();
+                    }
+                    else
+                    {
+                        info.QueryCount = -1;
+                        merchant.QueryCount = -1;
+                        info.AlipayRemark = jsonObj["alipay_merchant_indirect_authorder_querystatus_response"]["msg"].ToString();
+                    }
                     LogHelper.Instance.WriteLog("start2end", "查询支付宝商户意愿申请状态");
                     db.SaveChanges();
                 }

Util/HaoDa/TestHaoDaService.cs

@@ -31,7 +31,7 @@ namespace MySystem
             // RedisDbconn.Instance.AddList("AlipayForHaoDaQueue",824);
             // RedisDbconn.Instance.AddList("WeChatForHaoDaQueue",824);
             // AlipayAddInfo(826);//提交支付宝开户意愿申请单
-            AlipayAddInfo(825,"202309011037751699");//查询支付宝开户意愿申请状态
+            // AlipayAddInfo(828,"202309011037906510");//查询支付宝开户意愿申请状态
             // WeChatAddInfo(826);//提交微信开户意愿申请单
             // WeChatAddInfo(825,"2000002424428809");//查询微信开户意愿申请状态
             // QueryMerchantStatus(824);//新建商户查询状态

Util/HaoDa/WeChatPayBackService.cs

@@ -66,6 +66,19 @@ namespace MySystem
                     order.MaxDivi = order.MaxDivi;
                     order.SeoTitle = 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)
+                    {
+                        addinfo.Status = 2;
+                        merchant.Status = 2;
+                        addinfo.WeChatRemark = "";
+                    }
+                    else if(addinfo.QueryCount == 1 && order.PayMode == 1)
+                    {
+                        addinfo.QueryCount = 2;
+                        merchant.QueryCount = 2;
+                        addinfo.AlipayRemark = "";
+                    }
                     order.UserId = merchant.UserId;
                     ConsumerOrders check = db.ConsumerOrders.FirstOrDefault(m => m.Id < order.Id && m.Status > 0 && m.PayMode == order.PayMode && m.MerchantId == order.MerchantId);
                     if (check != null)
@@ -82,7 +95,6 @@ namespace MySystem
                     Models.Main1.PosMachines machine = db1.PosMachines.FirstOrDefault(m => m.PosSn == order.SnNo);
                     if(machine != null)
                     {
-                        MerchantAddInfo addinfo = db.MerchantAddInfo.FirstOrDefault(m => m.Id == order.MerchantId) ?? new MerchantAddInfo();
                         if(!string.IsNullOrEmpty(addinfo.AliMerchantId))
                         {
                             AliIotFunction.Instance.IotTradeVoice(machine.SeoDescription, addinfo.AliMerchantId, order.PayMoney.ToString("f2"), "OTHER");