Merge branch 'feature-dgy-更新签约码' into DuGuYang

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

@@ -184,6 +184,27 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
         #endregion
 
 
+        #region 进件管理-直连更新签约码
+        [Authorize]
+        public JsonResult DirectUpdateSignUrl(string value)
+        {
+            value = PublicFunction.DesDecrypt(value);
+            JsonData data = JsonMapper.ToObject(value);
+            AppResultJson result = DirectUpdateSignUrlDo(value);
+            return Json(new AppResultJson() { Status = result.Status, Info = result.Info, Data = result.Data });
+        }
+        private AppResultJson DirectUpdateSignUrlDo(string value)
+        {
+            JsonData data = JsonMapper.ToObject(value);
+            int MerchantId = int.Parse(function.CheckInt(data["MerchantId"].ToString()));
+            string Kind = data["Kind"].ToString(); //类型(1 支付宝 2 微信 )
+            Dictionary<string, object> Obj = new Dictionary<string, object>();
+            RedisDbconn.Instance.AddList("UpdateSignUrlQueue", "{\"MerchantId\":\"" + MerchantId + "\",\"Kind\":\"" + Kind + "\"}");
+            return new AppResultJson() { Status = "1", Info = "", Data = Obj };
+        }
+        #endregion
+
+
 
         #region 商户管理-直连查询商户交易信息
         [Authorize]
@@ -409,7 +430,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             Obj.Add("WeChatRemark", query.WeChatRemark); //微信备注
             Obj.Add("WeChatMerchantId", query.WeChatMerchantId); //微信商户号
             Obj.Add("Status", query.Status); //微信审核状态
-            if(query.Status < 2)
+            if (query.Status < 2)
             {
                 RedisDbconn.Instance.AddList("WeChatSignQueue", new MerchantSign()
                 {
@@ -445,7 +466,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             Obj.Add("AlipayRemark", query.AlipayRemark); //支付宝备注
             Obj.Add("Status", query.QueryCount); //支付宝审核状态
 
-            if(query.Status < 2)
+            if (query.Status < 2)
             {
                 RedisDbconn.Instance.AddList("AlipaySignQueue", new MerchantSign()
                 {

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

@@ -324,10 +324,16 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         {
             JsonData data = JsonMapper.ToObject(value);
             int id = int.Parse(function.CheckInt(data["id"].ToString()));
-            Dictionary<string, object> Obj = new Dictionary<string, object>();  
+            Dictionary<string, object> Obj = new Dictionary<string, object>();
             var merAddInfo = main2db.MerchantAddInfo.FirstOrDefault(m => m.Id == id) ?? new MerchantAddInfo();
+            if (merAddInfo.HdStatus != 3)
+            {
+                return new AppResultJson() { Status = "-1", Info = "商户未添加分账接收方账户", Data = Obj };
+            }
             var merInfo = main2db.MerchantInfo.FirstOrDefault(m => m.Id == id) ?? new MerchantInfo();
             merAddInfo.Status = 0;
+            merAddInfo.ApplymentId = null;
+            merAddInfo.WeChatSignUrl = null;
             merInfo.Status = 0;
             RedisDbconn.Instance.AddList("WeChatForHaoDaQueue", id.ToString());
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
@@ -347,11 +353,17 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         {
             JsonData data = JsonMapper.ToObject(value);
             int id = int.Parse(function.CheckInt(data["id"].ToString()));
-            Dictionary<string, object> Obj = new Dictionary<string, object>(); 
+            Dictionary<string, object> Obj = new Dictionary<string, object>();
             var merAddInfo = main2db.MerchantAddInfo.FirstOrDefault(m => m.Id == id) ?? new MerchantAddInfo();
+            if (merAddInfo.HdStatus != 3)
+            {
+                return new AppResultJson() { Status = "-1", Info = "商户未添加分账接收方账户", Data = Obj };
+            }
             var merInfo = main2db.MerchantInfo.FirstOrDefault(m => m.Id == id) ?? new MerchantInfo();
             merAddInfo.QueryCount = 0;
-            merInfo.QueryCount = 0;                       
+            merAddInfo.SeoTitle = null;
+            merAddInfo.AlipaySignUrl = null;
+            merInfo.QueryCount = 0;
             RedisDbconn.Instance.AddList("AlipayForHaoDaQueue", id.ToString());
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
         }
@@ -370,7 +382,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         {
             JsonData data = JsonMapper.ToObject(value);
             int id = int.Parse(function.CheckInt(data["id"].ToString()));
-            Dictionary<string, object> Obj = new Dictionary<string, object>(); 
+            Dictionary<string, object> Obj = new Dictionary<string, object>();
             var merAddInfo = main2db.MerchantAddInfo.FirstOrDefault(m => m.Id == id) ?? new MerchantAddInfo();
             var merInfo = main2db.MerchantInfo.FirstOrDefault(m => m.Id == id) ?? new MerchantInfo();
             merAddInfo.Status = 0;
@@ -378,7 +390,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             merInfo.Status = 0;
             merInfo.QueryCount = 0;
             RedisDbconn.Instance.AddList("MerchantConfirmHdQueue", "{\"MerchantId\":\"" + id + "\"}");
-            main2db.SaveChanges();                       
+            main2db.SaveChanges();
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
         }
         #endregion
@@ -398,7 +410,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             int id = int.Parse(function.CheckInt(data["id"].ToString()));
             var merAddInfo = main2db.MerchantAddInfo.FirstOrDefault(m => m.Id == id) ?? new MerchantAddInfo();
             merAddInfo.HdBindWeChat = 0;
-            main2db.SaveChanges();          
+            main2db.SaveChanges();
             return new AppResultJson() { Status = "1", Info = "" };
         }
         #endregion
@@ -458,12 +470,12 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             int HdStatus = 0;
             int WeChatStatus = 0;
             int AlipayStatus = 0;
-            if(query.HdStatus == 0 && query.Status == -1)
+            if (query.HdStatus == 0 && query.Status == -1)
             {
                 HdStatus = -1;
                 HdRemark = query.WeChatRemark;
             }
-            if(query.HdStatus == 3)
+            if (query.HdStatus == 3)
             {
                 WeChatStatus = query.Status;
                 AlipayStatus = query.QueryCount;