已完成，待测试

Areas/Api/Controllers/v1/Main1/ConsumerOrdersController.cs

@@ -166,9 +166,9 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             ConsumerOrders query = new ConsumerOrders();
             int id = int.Parse(function.CheckInt(data["id"].ToString()));
             query = ConsumerOrdersService.Query(id);
-            Obj.Add("DivideFlag", ""); //分账标记
-            Obj.Add("DivideDate", ""); //分账时间
-            Obj.Add("DivideNote", ""); //分账备注
+            Obj.Add("DivideFlag", query.DivideFlag); //分账标记
+            Obj.Add("DivideDate", query.DivideDate == null ? "" : query.DivideDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //分账时间
+            Obj.Add("DivideNote", query.DivideLog); //分账备注
 
             return Obj;
         }
@@ -188,11 +188,16 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             JsonData data = JsonMapper.ToObject(value);
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             ConsumerOrders query = new ConsumerOrders();
-            Dictionary<string, object> fields = new Dictionary<string, object>();
-            fields.Add("create_date", DateTime.Now); //创建时间
-            fields.Add("update_date", DateTime.Now); //修改时间
-            AppResultJson resultJson = ConsumerOrdersService.Add(fields, false);
-
+            int id = int.Parse(function.CheckInt(data["id"].ToString()));
+            query = ConsumerOrdersService.Query(id);
+            if(query.PayMoney == 2)
+            {
+                RedisDbconn.Instance.AddList("AddWeChatDiviQueue", id.ToString());
+            }
+            else if(query.PayMoney == 1)
+            {
+                RedisDbconn.Instance.AddList("AddAlipayDiviQueue", id.ToString());
+            }
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
         }
         #endregion

Areas/Api/Controllers/v1/Main1/MerchantAddInfoController.cs

@@ -334,7 +334,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         [Authorize]
         public JsonResult DirectWeChatMerchantAdd(string value)
         {
-            value = PublicFunction.DesDecrypt(value); ;
+            value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
             AppResultJson result = DirectWeChatMerchantAddDo(value);
             return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
@@ -343,12 +343,8 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         {
             JsonData data = JsonMapper.ToObject(value);
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            MerchantAddInfo query = new MerchantAddInfo();
-            Dictionary<string, object> fields = new Dictionary<string, object>();
-            fields.Add("create_date", DateTime.Now); //创建时间
-            fields.Add("update_date", DateTime.Now); //修改时间
-            AppResultJson resultJson = MerchantAddInfoService.Add(fields, false);
-
+            int id = int.Parse(function.CheckInt(data["id"].ToString()));
+            RedisDbconn.Instance.AddList("MerchantConfirmQueue", "{\"MerchantId\":\"" + id + "\",\"Kind\":\"2\"}");
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
         }
         #endregion
@@ -366,12 +362,8 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         {
             JsonData data = JsonMapper.ToObject(value);
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            MerchantAddInfo query = new MerchantAddInfo();
-            Dictionary<string, object> fields = new Dictionary<string, object>();
-            fields.Add("create_date", DateTime.Now); //创建时间
-            fields.Add("update_date", DateTime.Now); //修改时间
-            AppResultJson resultJson = MerchantAddInfoService.Add(fields, false);
-
+            int id = int.Parse(function.CheckInt(data["id"].ToString()));
+            RedisDbconn.Instance.AddList("MerchantConfirmQueue", "{\"MerchantId\":\"" + id + "\",\"Kind\":\"1\"}");
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
         }
         #endregion
@@ -395,7 +387,16 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             Obj.Add("WeChatSignUrl", query.WeChatSignUrl); //微信签约地址
             Obj.Add("WeChatRemark", query.WeChatRemark); //微信备注
             Obj.Add("WeChatMerchantId", query.WeChatMerchantId); //微信商户号
-            Obj.Add("Status", ""); //微信审核状态
+            Obj.Add("Status", query.Status); //微信审核状态
+            if(query.Status < 1)
+            {
+                RedisDbconn.Instance.AddList("WeChatSignQueue", new MerchantSign()
+                {
+                    BusinessCode = query.BusinessCode,
+                    MerchantAddInfoId = id,
+                    Status = ""
+                });
+            }
 
             return Obj;
         }
@@ -421,7 +422,17 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             Obj.Add("AlipayAuthToken", query.AlipayAuthToken); //支付宝商家令牌
             Obj.Add("AlipaySignUrl", query.AlipaySignUrl); //支付宝签约地址
             Obj.Add("AlipayRemark", query.AlipayRemark); //支付宝备注
-            Obj.Add("Status", ""); //支付宝审核状态
+            Obj.Add("Status", query.QueryCount); //支付宝审核状态
+
+            if(query.Status < 1)
+            {
+                RedisDbconn.Instance.AddList("AlipaySignQueue", new MerchantSign()
+                {
+                    BusinessCode = query.SeoTitle,
+                    MerchantAddInfoId = id,
+                    Status = ""
+                });
+            }
 
             return Obj;
         }

Areas/Api/Controllers/v1/Main2/ConsumerOrdersController.cs

@@ -165,9 +165,9 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             ConsumerOrders query = new ConsumerOrders();
             int id = int.Parse(function.CheckInt(data["id"].ToString()));
             query = ConsumerOrdersService.Query(id);
-            Obj.Add("DivideFlag", ""); //分账标记
-            Obj.Add("DivideDate", ""); //分账时间
-            Obj.Add("DivideNote", ""); //分账备注
+            Obj.Add("DivideFlag", query.DivideFlag); //分账标记
+            Obj.Add("DivideDate", query.DivideDate == null ? "" : query.DivideDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //分账时间
+            Obj.Add("DivideNote", query.DivideLog); //分账备注
 
             return Obj;
         }
@@ -186,12 +186,8 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         {
             JsonData data = JsonMapper.ToObject(value);
             Dictionary<string, object> Obj = new Dictionary<string, object>();
-            ConsumerOrders query = new ConsumerOrders();
-            Dictionary<string, object> fields = new Dictionary<string, object>();
-            fields.Add("create_date", DateTime.Now); //创建时间
-            fields.Add("update_date", DateTime.Now); //修改时间
-            AppResultJson resultJson = ConsumerOrdersService.Add(fields, false);
-
+            int id = int.Parse(function.CheckInt(data["id"].ToString()));
+            RedisDbconn.Instance.AddList("AddHdDiviQueue", id.ToString());
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
         }
         #endregion

Areas/Api/Controllers/v1/Main2/MerchantAddInfoController.cs

@@ -310,13 +310,9 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         private AppResultJson UnionWeChatMerchantOpenAccountDo(string value)
         {
             JsonData data = JsonMapper.ToObject(value);
-            Dictionary<string, object> Obj = new Dictionary<string, object>();
-            MerchantAddInfo query = new MerchantAddInfo();
-            Dictionary<string, object> fields = new Dictionary<string, object>();
-            fields.Add("create_date", DateTime.Now); //创建时间
-            fields.Add("update_date", DateTime.Now); //修改时间
-            AppResultJson resultJson = MerchantAddInfoService.Add(fields, false);
-
+            int id = int.Parse(function.CheckInt(data["id"].ToString()));
+            Dictionary<string, object> Obj = new Dictionary<string, object>();                        
+            RedisDbconn.Instance.AddList("WeChatForHaoDaQueue", id.ToString());
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
         }
         #endregion
@@ -333,13 +329,9 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         private AppResultJson UnionAlipayMerchantOpenAccountDo(string value)
         {
             JsonData data = JsonMapper.ToObject(value);
-            Dictionary<string, object> Obj = new Dictionary<string, object>();
-            MerchantAddInfo query = new MerchantAddInfo();
-            Dictionary<string, object> fields = new Dictionary<string, object>();
-            fields.Add("create_date", DateTime.Now); //创建时间
-            fields.Add("update_date", DateTime.Now); //修改时间
-            AppResultJson resultJson = MerchantAddInfoService.Add(fields, false);
-
+            int id = int.Parse(function.CheckInt(data["id"].ToString()));
+            Dictionary<string, object> Obj = new Dictionary<string, object>();                        
+            RedisDbconn.Instance.AddList("AlipayForHaoDaQueue", id.ToString());
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
         }
         #endregion
@@ -356,13 +348,9 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         private AppResultJson UnionMerchantAddDo(string value)
         {
             JsonData data = JsonMapper.ToObject(value);
-            Dictionary<string, object> Obj = new Dictionary<string, object>();
-            MerchantAddInfo query = new MerchantAddInfo();
-            Dictionary<string, object> fields = new Dictionary<string, object>();
-            fields.Add("create_date", DateTime.Now); //创建时间
-            fields.Add("update_date", DateTime.Now); //修改时间
-            AppResultJson resultJson = MerchantAddInfoService.Add(fields, false);
-
+            int id = int.Parse(function.CheckInt(data["id"].ToString()));
+            Dictionary<string, object> Obj = new Dictionary<string, object>();                        
+            RedisDbconn.Instance.AddList("MerchantConfirmHdQueue", "{\"MerchantId\":\"" + id + "\"}");
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
         }
         #endregion
@@ -379,14 +367,11 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         private AppResultJson UnionMerchantBindWeChatAppIdDo(string value)
         {
             JsonData data = JsonMapper.ToObject(value);
-            Dictionary<string, object> Obj = new Dictionary<string, object>();
-            MerchantAddInfo query = new MerchantAddInfo();
+            int id = int.Parse(function.CheckInt(data["id"].ToString()));
             Dictionary<string, object> fields = new Dictionary<string, object>();
-            fields.Add("create_date", DateTime.Now); //创建时间
-            fields.Add("update_date", DateTime.Now); //修改时间
-            AppResultJson resultJson = MerchantAddInfoService.Add(fields, false);
-
-            return new AppResultJson() { Status = "1", Info = "", Data = Obj };
+            fields.Add("HdBindWeChat", 0);
+            MerchantAddInfoService.Edit(fields, id, false);            
+            return new AppResultJson() { Status = "1", Info = "" };
         }
         #endregion
 
@@ -437,14 +422,32 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             Obj.Add("OutMchtNo", query.OutMchtNo); //慧掌柜商户号
             Obj.Add("StoreNo", query.StoreNo); //门店号
             Obj.Add("ToAcctNo", query.ToAcctNo); //分账接收方
-            Obj.Add("HdStatus", query.HdStatus); //好哒进件状态
             Obj.Add("HdPassDate", query.HdPassDate == null ? "" : query.HdPassDate.Value.ToString("yyyy-MM-dd HH:mm:ss")); //好哒审核通过时间
             Obj.Add("HdBindWeChat", query.HdBindWeChat); //好哒绑定微信状态
-            Obj.Add("HdRemark", ""); //好哒备注
-            Obj.Add("WeChatRemark", ""); //微信备注
-            Obj.Add("AlipayRemark", ""); //支付宝备注
-            Obj.Add("WeChatStatus", ""); //微信审核状态
-            Obj.Add("AlipayStatus", ""); //微信审核状态
+            string HdRemark = "";
+            string WeChatRemark = "";
+            string AlipayRemark = "";
+            int HdStatus = 0;
+            int WeChatStatus = 0;
+            int AlipayStatus = 0;
+            if(query.HdStatus == 0 && query.Status == -1)
+            {
+                HdStatus = -1;
+                HdRemark = query.WeChatRemark;
+            }
+            if(query.HdStatus == 3)
+            {
+                WeChatStatus = query.Status;
+                AlipayStatus = query.QueryCount;
+                WeChatRemark = query.WeChatRemark;
+                AlipayRemark = query.AlipayRemark;
+            }
+            Obj.Add("HdStatus", HdStatus); //好哒进件状态
+            Obj.Add("HdRemark", HdRemark); //好哒备注
+            Obj.Add("WeChatRemark", WeChatRemark); //微信备注
+            Obj.Add("AlipayRemark", AlipayRemark); //支付宝备注
+            Obj.Add("WeChatStatus", WeChatStatus); //微信审核状态
+            Obj.Add("AlipayStatus", AlipayStatus); //微信审核状态
 
             return Obj;
         }

Entity/MerchantSign.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+namespace MySystem
+{
+    public class MerchantSign
+    {
+        public string BusinessCode { get; set; }
+        public int MerchantAddInfoId { get; set; }
+        public string Status { get; set; }
+
+    }
+}

Models/Main1/ConsumerOrders.cs

@@ -29,5 +29,8 @@ namespace MySystem.Models.Main1
         public ulong IsAct { get; set; }
         public int UserId { get; set; }
         public decimal MerchantActualAmount { get; set; }
+        public string DivideLog { get; set; }
+        public int DivideFlag { get; set; }
+        public DateTime? DivideDate { get; set; }
     }
 }

Models/Main1/WebCMSEntities.cs

@@ -2257,6 +2257,20 @@ namespace MySystem.Models.Main1
 
                 entity.Property(e => e.CurDivi).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.DivideDate)
+                    .HasColumnType("datetime")
+                    .HasComment("提交分账时间");
+
+                entity.Property(e => e.DivideFlag)
+                    .HasColumnType("int(11)")
+                    .HasComment("分账标记");
+
+                entity.Property(e => e.DivideLog)
+                    .HasColumnType("mediumtext")
+                    .HasComment("分账结果日志")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.IsAct)
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");

Models/Main2/ConsumerOrders.cs

@@ -29,5 +29,8 @@ namespace MySystem.Models.Main2
         public ulong IsAct { get; set; }
         public int UserId { get; set; }
         public decimal MerchantActualAmount { get; set; }
+        public int DivideFlag { get; set; }
+        public DateTime? DivideDate { get; set; }
+        public string DivideLog { get; set; }
     }
 }

Models/Main2/WebCMSEntities.cs

@@ -2257,6 +2257,20 @@ namespace MySystem.Models.Main2
 
                 entity.Property(e => e.CurDivi).HasColumnType("decimal(18,2)");
 
+                entity.Property(e => e.DivideDate)
+                    .HasColumnType("datetime")
+                    .HasComment("提交分账时间");
+
+                entity.Property(e => e.DivideFlag)
+                    .HasColumnType("int(11)")
+                    .HasComment("分账标记");
+
+                entity.Property(e => e.DivideLog)
+                    .HasColumnType("mediumtext")
+                    .HasComment("分账结果日志")
+                    .HasCharSet("utf8")
+                    .HasCollation("utf8_general_ci");
+
                 entity.Property(e => e.IsAct)
                     .HasColumnType("bit(1)")
                     .HasDefaultValueSql("b'0'");