调整

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

@@ -39,9 +39,8 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             string Remark = data["Remark"].ToString(); //备注
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             MerchantDepositBack query = new MerchantDepositBack();
-            int Id = int.Parse(function.CheckInt(data["id"].ToString()));
             Dictionary<string, object> fields = new Dictionary<string, object>();
-            MerchantDepositBackService.Edit(fields, Id, false);
+            // MerchantDepositBackService.Edit(fields, Id, false);
 
             return new AppResultJson() { Status = "1", Info = "", Data = Obj };
         }

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

@@ -131,6 +131,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             JsonData data = JsonMapper.ToObject(value);
             string MerchantId = data["MerchantId"].ToString(); //商户Id
             string Mobile = data["Mobile"].ToString(); //新手机号
+            string MobileCode = data["MobileCode"].ToString(); //短信验证码
             Dictionary<string, object> Obj = new Dictionary<string, object>();
             if (Mobile.Length != 11 || !function.IsInt(Mobile) || Mobile.Substring(0, 1) != "1")
             {
@@ -141,7 +142,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             {
                 return new AppResultJson() { Status = "-1", Info = "短信验证码不正确" };
             }
-            if (mobilecheck.CheckCode != Mobile)
+            if (mobilecheck.CheckCode != MobileCode)
             {
                 return new AppResultJson() { Status = "-1", Info = "短信验证码不正确" };
             }

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

@@ -330,17 +330,16 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             var Id = int.Parse(MerchantId);
             var query = main2db.MerchantAddInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantAddInfo();
             var merInfo = main2db.MerchantInfo.FirstOrDefault(m => m.Id == Id) ?? new MerchantInfo();
-            Dictionary<string, object> fields = new Dictionary<string, object>();
             if (query.Id > 0)
             {
-                if (string.IsNullOrEmpty(MerchantName))
+                if (!string.IsNullOrEmpty(MerchantName))
                 {
                     query.CertMerchantName = MerchantName;
                     merInfo.Name = MerchantName;
                 }
                 if (!string.IsNullOrEmpty(MerchantShortName))
                 {
-                    fields.Add("MerchantShortname", MerchantShortName);
+                    query.MerchantShortname = MerchantShortName;
                 }
             }
             main2db.SaveChanges();

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

@@ -23,16 +23,16 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
         }
 
 
-        #region 商户管理-商户管理-直连商户活动变更记录
+        #region 商户管理-商户管理-银联商户活动变更记录
         [Authorize]
-        public JsonResult DirectMerchantParamSetRecordList(string value)
+        public JsonResult UnionPayMerchantParamSetRecordList(string value)
         {
             value = PublicFunction.DesDecrypt(value);
             JsonData data = JsonMapper.ToObject(value);
-            List<Dictionary<string, object>> dataList = DirectMerchantParamSetRecordListDo(value);
+            List<Dictionary<string, object>> dataList = UnionPayMerchantParamSetRecordListDo(value);
             return Json(new AppResultJson() { Status = "1", Info = "", Data = dataList });
         }
-        private List<Dictionary<string, object>> DirectMerchantParamSetRecordListDo(string value)
+        private List<Dictionary<string, object>> UnionPayMerchantParamSetRecordListDo(string value)
         {
             JsonData data = JsonMapper.ToObject(value);
             string MerchantId = data["MerchantId"].ToString(); //商户Id