更新实体，添加支付宝和微信商户号

Models/Main/MerchantAddInfo.cs

@@ -142,5 +142,7 @@ namespace MySystem.Models.Main
         public int OpenAct { get; set; }
         public string StoreNo { get; set; }
         public string OutMchtNo { get; set; }
+        public string AliMerchantId { get; set; }
+        public string WeChatMerchantId { get; set; }
     }
 }

Models/Main/WebCMSEntities.cs

@@ -5141,6 +5141,12 @@ namespace MySystem.Models.Main
                     .HasCharSet("utf8")
                     .HasCollation("utf8_general_ci");
 
+                entity.Property(e => e.AliMerchantId)
+                    .HasColumnType("varchar(100)")
+                    .HasComment("支付宝商户号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.AlipayAuthToken)
                     .HasColumnType("varchar(100)")
                     .HasCharSet("utf8")
@@ -5725,6 +5731,12 @@ namespace MySystem.Models.Main
 
                 entity.Property(e => e.Version).HasColumnType("int(11)");
 
+                entity.Property(e => e.WeChatMerchantId)
+                    .HasColumnType("varchar(100)")
+                    .HasComment("微信商户号")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.WeChatRemark)
                     .HasColumnType("varchar(500)")
                     .HasCharSet("utf8")

Startup.cs

@@ -137,15 +137,15 @@ namespace MySystem
             initMainServer();
             MerchantConfirmService.Instance.Start(); //提交商户进件
             CheckWeChatSignService.Instance.Start(); //查询商户审核状态
-            ProfitShareService.Instance.Start(); //分账
-            // TestOpenDivideAccountsService.Instance.Start(); //测试
-            HaoDaExtHelper.Instance.StartWeChat();
-            HaoDaExtHelper.Instance.StartAlipay();
-            HaoDaExtQueryHelper.Instance.StartWeChat();
-            HaoDaExtQueryHelper.Instance.StartAlipay();
+            // ProfitShareService.Instance.Start(); //分账
+            // // TestOpenDivideAccountsService.Instance.Start(); //测试
+            // HaoDaExtHelper.Instance.StartWeChat();
+            // HaoDaExtHelper.Instance.StartAlipay();
+            // HaoDaExtQueryHelper.Instance.StartWeChat();
+            // HaoDaExtQueryHelper.Instance.StartAlipay();
             HaoDaAuthQueryHelper.Instance.Start(); //查询实名认证状态
-            WeChatPayBackService.Instance.Start(); //支付回调
-            WeChatPayBackService.Instance.StartProfitShare(); //分账队列
+            // WeChatPayBackService.Instance.Start(); //支付回调
+            // WeChatPayBackService.Instance.StartProfitShare(); //分账队列
         }
 
         //初始化数据结构

Util/HaoDa/CheckWeChatSignService.cs

@@ -54,7 +54,7 @@ namespace MySystem
                 var returnInfo = HaoDaHelper.Instance.QueryMerchantStatus(HaoDaHelper.BrhCode, query.MerchantNo);
                 JsonData dic = JsonMapper.ToObject(returnInfo);
                 //审核成功(1- 待审核 2 -审核中 3 -审核被拒绝 4 -审核通过 6 -待复核)
-                if (dic["data"]["code"].ToString() == "4")
+                if (dic["data"]["code"].ToString() == "4" && !string.IsNullOrEmpty(dic["data"]["storeNo"].ToString()) && !string.IsNullOrEmpty(dic["data"]["outMchtNo"].ToString()))
                 {
                     //查询商户是否存在
                     MerchantAddInfo merchantadd = db.MerchantAddInfo.FirstOrDefault(m => m.Id == mId);
@@ -106,7 +106,7 @@ namespace MySystem
                                 //失败
                                 if (bindInfo["resultCode"].ToString() == "0")
                                 {
-                                    merchantadd.AlipayRemark = Infos["errorDesc"].ToString();
+                                    merchantadd.AlipayRemark = bindInfo["errorDesc"].ToString();
                                 }
                             }
                         }
@@ -117,7 +117,6 @@ namespace MySystem
                         RedisDbconn.Instance.AddList("WeChatForHaoDaQueue",mId);
 
                     }
-                    return "wait";
                 }
                 //审核被拒绝
                 else if (dic["data"]["code"].ToString() == "3")

Util/HaoDa/HaoDaAuthQueryHelper.cs

@@ -58,18 +58,20 @@ public class HaoDaAuthQueryHelper
                 if (wxcheck == "1")
                 {
                     info.Status = 2;
+                    info.WeChatMerchantId = jsonObj["wechatMerchantId"].ToString();
                     merchant.Status = 2;
                     info.WeChatRemark = "";
                 }
                 if (alicheck == "1")
                 {
                     info.QueryCount = 2;
+                    info.AliMerchantId = jsonObj["aliMerchantId"].ToString();
                     merchant.QueryCount = 2;
                     info.AlipayRemark = "";
                 }
                 if (wxcheck != "1" || alicheck != "1")
                 {
-                    RedisDbconn.Instance.AddList("HaoDaAuthQueryHelper", "{\"MerchantId\":\"" + MerchantId + "\",\"MchtNo\":\"" + info.MchtNo + "\",\"StoreNo\":\"" + info.StoreNo + "\"}");
+                    RedisDbconn.Instance.AddList("HaoDaAuthQueryHelper", "{\"MerchantId\":\"" + MerchantId + "\",\"MchtNo\":\"" + info.OutMchtNo + "\",\"StoreNo\":\"" + info.StoreNo + "\"}");
                 }
 
                 db.SaveChanges();