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 | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 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 359427c..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
@@ -287,17 +287,9 @@
return ERROR;
}
}
- public static void main(String[] args) {
- String bankName = "中国工商银行"; // 要转换为简写的银行名称
- Pattern pattern = Pattern.compile("([\\u4e00-\\u9fa5]+)(?=\\s+[A-Za-z]+$)");
- Matcher matcher = pattern.matcher(bankName);
- if (matcher.find()) {
- System.out.println(matcher.group()); // 输出结果："工商银行" -> "ICBC"
- } else {
- System.out.println("无法识别该银行名称！");
- }
- }
+
+
/**
* 支付宝商户认证提交
*/
@@ -398,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);
@@ -443,7 +441,6 @@
" \"mobile\":\""+phone+"\"," +
" }" +
" ],";
-
// todo 拼接
String biz_cards=" \"biz_cards\":[" +
" {" +
@@ -493,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