From c4addd15f7adca50420f7ced176c4a7192219273 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 30 一月 2024 14:44:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
index 3e8bac2..0675779 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/OperatorController.java
@@ -390,6 +390,12 @@
operatorAuth.setShopProvince(shopProvince);
operatorAuth.setShopProvinceCode(shopProvinceCode);
operatorAuth.setShopCityCode(shopCityCode);
+ if(StringUtils.hasLength(province)&& province.equals("请选择省")){
+ operatorAuth.setProvince(null);
+ }
+ if(StringUtils.hasLength(city)&& province.equals("请选择市")){
+ operatorAuth.setCity(null);
+ }
operatorAuth.setProvince(province);
operatorAuth.setProvinceCode(provinceCode);
operatorAuth.setShopDistrict(shopDistrict);
@@ -435,7 +441,6 @@
" \"mobile\":\""+phone+"\"," +
" }" +
" ],";
-
// todo 拼接
String biz_cards=" \"biz_cards\":[" +
" {" +
@@ -485,6 +490,9 @@
if (accountType.equals("bankCard")){
request.setBizContent(param
+ biz_cards+res);
+ }else{
+ request.setBizContent(param
+ +res);
}
AntMerchantExpandIndirectZftCreateResponse response = null;
try {
--
Gitblit v1.7.1