clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

手机号去除空格

This commit is contained in:
Hawking 2023-04-19 22:53:53 +08:00
parent ceafb5526c
commit 8d3a159405
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerBankController.java
View File

@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -45,6 +46,8 @@ public class CustomerBankController {
@ResponseBody
private AjaxResult bindBankCard(@RequestBody @Valid BindBankCardRequest request) throws BaseAdaPayException {
Set<Merchant> merchants = AdapayConfig.getMerchants();
String phone = request.getPhone();
phone = StringUtils.trimAllWhitespace(phone);
for (Merchant merchant : merchants) {
String memberId = AdapayUtils.getCustomerMemberId(request.getCustomerId(), merchant.getDeptId());
@ -60,7 +63,7 @@ public class CustomerBankController {
log.info("用户[memberId={}]已存在 跳过实名直接绑卡", memberId);
} else {
// 先在Adapay创建实名用户
Map<String, Object> result1 = adapayService.createMember(merchant.getDeptId(), memberId, request.getPhone(),
Map<String, Object> result1 = adapayService.createMember(merchant.getDeptId(), memberId, phone,
request.getName(), request.getCertId());
if (!AdapayStatusEnum.succeeded.code.equals(result1.get("status"))) {
log.error("实名认证失败[{}]", JSON.toJSONString(result1));
@ -70,7 +73,7 @@ public class CustomerBankController {
// 开始创建结算账户
JSONObject result2 = adapayService.createSettleAccount(merchant.getDeptId(), memberId, request.getBankNum(), request.getName(),
"2", request.getCertId(), request.getPhone(), null, null, null);
"2", request.getCertId(), phone, null, null, null);
if (!AdapayStatusEnum.succeeded.code.equals(result2.get("status"))) {
if ("account_exists".equals(result2.get("error_code"))) {
log.info("用户[memberId={}]结算账户已存在 跳过", memberId);
@ -85,7 +88,7 @@ public class CustomerBankController {
customerBank.setName(request.getName());
customerBank.setCertId(request.getCertId());
customerBank.setBankNum(request.getBankNum());
customerBank.setPhone(request.getPhone());
customerBank.setPhone(phone);
customerBank.setDeptId(merchant.getDeptId());
customerBank.setAdapayMemberId(memberId);
customerBank.setSettleAccount(1);

9
ghy-admin/src/main/java/com/ghy/web/controller/worker/WorkerBankController.java
View File

@ -21,6 +21,7 @@ import com.huifu.adapay.core.exception.BaseAdaPayException;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@ -57,6 +58,8 @@ public class WorkerBankController extends BaseController {
return AjaxResult.error("师傅未通过审核，不能绑定银行卡");
}
Set<Merchant> merchants = AdapayConfig.getMerchants();
String phone = request.getPhone();
phone = StringUtils.trimAllWhitespace(phone);
for (Merchant merchant : merchants) {
String memberId = AdapayUtils.getWorkerMemberId(request.getWorkerId(), merchant.getDeptId());
@ -66,7 +69,7 @@ public class WorkerBankController extends BaseController {
logger.info("用户[memberId={}]已存在 跳过实名直接绑卡", memberId);
} else {
// 先在Adapay创建实名用户
Map<String, Object> result1 = adapayService.createMember(merchant.getDeptId(), memberId, request.getPhone(),
Map<String, Object> result1 = adapayService.createMember(merchant.getDeptId(), memberId, phone,
request.getName(), request.getCertId());
if (!AdapayStatusEnum.succeeded.code.equals(result1.get("status"))) {
logger.error("实名认证失败[{}]", JSON.toJSONString(result1));
@ -76,7 +79,7 @@ public class WorkerBankController extends BaseController {
// 开始创建结算账户
JSONObject result2 = adapayService.createSettleAccount(merchant.getDeptId(), memberId, request.getBankNum(), request.getName(),
"2", request.getCertId(), request.getPhone(), null, null, null);
"2", request.getCertId(), phone, null, null, null);
if (!AdapayStatusEnum.succeeded.code.equals(result2.get("status"))) {
if ("account_exists".equals(result2.get("error_code"))) {
logger.info("用户[memberId={}]结算账户已存在 跳过", memberId);
@ -93,7 +96,7 @@ public class WorkerBankController extends BaseController {
workerBank.setName(request.getName());
workerBank.setCertId(request.getCertId());
workerBank.setBankNum(request.getBankNum());
workerBank.setPhone(request.getPhone());
workerBank.setPhone(phone);
workerBank.setDeptId(merchant.getDeptId());
workerBank.setAdapayMemberId(memberId);
workerBank.setSettleAccount(1);