Merge branch 'feature-dgy-润观米账户提现' into feature-dgy-后台测试

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

@@ -355,7 +355,12 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             JsonData data = JsonMapper.ToObject(value);
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             int id = int.Parse(function.CheckInt(data["id"].ToString()));
+            var merAddInfo = main1db.MerchantAddInfo.FirstOrDefault(m => m.Id == id) ?? new MerchantAddInfo();
+            var merInfo = main1db.MerchantInfo.FirstOrDefault(m => m.Id == id) ?? new MerchantInfo();
+            merAddInfo.Status = 0;
+            merInfo.Status = 0;
             RedisDbconn.Instance.AddList("MerchantConfirmQueue", "{\"MerchantId\":\"" + id + "\",\"Kind\":\"2\"}");
+            main1db.SaveChanges();
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
         }
         #endregion
@@ -374,7 +379,12 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             JsonData data = JsonMapper.ToObject(value);
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             int id = int.Parse(function.CheckInt(data["id"].ToString()));
+            var merAddInfo = main1db.MerchantAddInfo.FirstOrDefault(m => m.Id == id) ?? new MerchantAddInfo();
+            var merInfo = main1db.MerchantInfo.FirstOrDefault(m => m.Id == id) ?? new MerchantInfo();
+            merAddInfo.QueryCount = 0;
+            merInfo.QueryCount = 0;
             RedisDbconn.Instance.AddList("MerchantConfirmQueue", "{\"MerchantId\":\"" + id + "\",\"Kind\":\"1\"}");
+            main1db.SaveChanges();
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
         }
         #endregion