Browse Source

修复修改功能
区域码查询功能修改

DuGuYang 2 years ago
parent
commit
8148ede658

+ 4 - 1
Areas/Api/Controllers/v1/Main1/MerchantAddInfoController.cs

@@ -294,17 +294,20 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
                 if (string.IsNullOrEmpty(query.AlipayPid))
                 if (string.IsNullOrEmpty(query.AlipayPid))
                 {
                 {
                     fields.Add("AlipayPid", AliPPID); //支付宝PID
                     fields.Add("AlipayPid", AliPPID); //支付宝PID
+                    query.AlipayPid = AliPPID;
                 }
                 }
                 if (!string.IsNullOrEmpty(AliPayToken))
                 if (!string.IsNullOrEmpty(AliPayToken))
                 {
                 {
                     fields.Add("AlipayAuthToken", AliPayToken); //支付宝token
                     fields.Add("AlipayAuthToken", AliPayToken); //支付宝token
+                    query.AlipayAuthToken = AliPayToken;
                 }
                 }
                 if (string.IsNullOrEmpty(query.SubMchid))
                 if (string.IsNullOrEmpty(query.SubMchid))
                 {
                 {
                     fields.Add("SubMchid", WeChatNo); //微信商户号
                     fields.Add("SubMchid", WeChatNo); //微信商户号
+                    query.SubMchid = WeChatNo;
                 }
                 }
             }
             }
-            AppResultJson resultJson = MerchantAddInfoService.Edit(fields, int.Parse(MerchantId), false);
+            // AppResultJson resultJson = MerchantAddInfoService.Edit(fields, int.Parse(MerchantId), false);
 
 
             return new AppResultJson() { Status = "1", Info = "添加成功", Data = Obj };
             return new AppResultJson() { Status = "1", Info = "添加成功", Data = Obj };
         }
         }

+ 1 - 1
Util/Main2/MerchantAddInfoUtil.cs

@@ -117,7 +117,7 @@ namespace MySystem.Service.Main2
             Obj.Add("OpenBankAccName", query.OpenBankAccName); // 开户许可证-开户名
             Obj.Add("OpenBankAccName", query.OpenBankAccName); // 开户许可证-开户名
             Obj.Add("OpenBankName", OpenBankAllService.Query(" BankChildNo='" + query.OpenUnionNo + "'").BankChild); // 开户许可证-开户行全称
             Obj.Add("OpenBankName", OpenBankAllService.Query(" BankChildNo='" + query.OpenUnionNo + "'").BankChild); // 开户许可证-开户行全称
             var str = "";
             var str = "";
-            str = HaoDaAreaCodeService.Query("CityCode='" + query.OpenBankRegionCode + "'").CityName;
+            str = HaoDaAreaCodeService.Query(" and CityCode='" + query.OpenBankRegionCode + "'").CityName;
             string OpenBankRegionCode = "";
             string OpenBankRegionCode = "";
             if (!string.IsNullOrEmpty(str))
             if (!string.IsNullOrEmpty(str))
             {
             {