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

合并代码出错

This commit is contained in:
HH 2022-05-26 11:27:12 +08:00
parent 6fd119b2aa
commit f63ba73cd3
4 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,6 @@ package com.ghy.web.controller.customer;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.ghy.common.adapay.AdapayConfig; import com.ghy.common.adapay.AdapayConfig;
import com.ghy.common.adapay.AdapayService; import com.ghy.common.adapay.AdapayService;
import com.ghy.common.adapay.MemberType;
import com.ghy.common.adapay.model.AdapayStatusEnum; import com.ghy.common.adapay.model.AdapayStatusEnum;
import com.ghy.common.adapay.model.Merchant; import com.ghy.common.adapay.model.Merchant;
import com.ghy.common.core.domain.AjaxResult; import com.ghy.common.core.domain.AjaxResult;
@ -44,7 +43,7 @@ public class CustomerBankController {
private AjaxResult bindBankCard(@RequestBody BindBankCardRequest request) throws BaseAdaPayException { private AjaxResult bindBankCard(@RequestBody BindBankCardRequest request) throws BaseAdaPayException {
Set<Merchant> merchants = AdapayConfig.getMerchants(); Set<Merchant> merchants = AdapayConfig.getMerchants();
for (Merchant merchant : merchants) { for (Merchant merchant : merchants) {
String memberId = AdapayUtils.getMemberId(request.getCustomerId(), merchant.getDeptId(), MemberType.CUSTOMER); String memberId = AdapayUtils.getCustomerMemberId(request.getCustomerId(), merchant.getDeptId());
// 先在Adapay创建实名用户 // 先在Adapay创建实名用户
Map<String, Object> result1 = adapayService.createMember(merchant.getDeptId(), memberId, request.getPhone(), Map<String, Object> result1 = adapayService.createMember(merchant.getDeptId(), memberId, request.getPhone(),
request.getName(), request.getCertId(), null, null, null, null); request.getName(), request.getCertId(), null, null, null, null);

12
ghy-common/src/main/java/com/ghy/common/adapay/MemberType.java
View File

@ -1,12 +0,0 @@
package com.ghy.common.adapay;
public enum MemberType {
WORKER("WK"),
CUSTOMER("CS");
public final String code;
MemberType(String code) {
this.code = code;
}
}

17
ghy-common/src/main/java/com/ghy/common/utils/AdapayUtils.java
View File

@ -9,14 +9,23 @@ import org.springframework.util.Assert;
@Slf4j @Slf4j
public class AdapayUtils { public class AdapayUtils {
public static String getMemberId(Long memberId, Long deptId) { /**
Assert.isTrue(Math.min(memberId, deptId) > 0, "Invalid [memberId] or [deptId]"); * 生成 Adapay member_id
return String.format("C%dD%d", memberId, deptId); *
* @param customerId 消费者ID
* @param deptId 分平台id
* @return Adapay member_id
*/
public static String getCustomerMemberId(Long customerId, Long deptId) {
Assert.isTrue(Math.min(customerId, deptId) > 0, "Invalid [customerId] or [deptId]");
return String.format("C%dD%d", customerId, deptId);
} }
/** /**
* 生成 Adapay member_id
*
* @param workerId 师傅id * @param workerId 师傅id
* @param deptId 分平台id * @param deptId 分平台id
* @return 生成的唯一id * @return 生成的唯一id
*/ */
public static String getWorkerMemberId(Long workerId, Long deptId) { public static String getWorkerMemberId(Long workerId, Long deptId) {

3
ghy-custom/src/main/java/com/ghy/customer/service/impl/CustomerBankServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.ghy.customer.service.impl; package com.ghy.customer.service.impl;
import com.ghy.common.adapay.MemberType;
import com.ghy.common.utils.AdapayUtils; import com.ghy.common.utils.AdapayUtils;
import com.ghy.customer.domain.CustomerBank; import com.ghy.customer.domain.CustomerBank;
import com.ghy.customer.mapper.CustomerBankMapper; import com.ghy.customer.mapper.CustomerBankMapper;
@ -46,7 +45,7 @@ public class CustomerBankServiceImpl implements CustomerBankService {
@Override @Override
public int insertCustomerBank(CustomerBank customerBank) { public int insertCustomerBank(CustomerBank customerBank) {
customerBank.setAdapayMemberId(AdapayUtils.getMemberId(customerBank.getCustomerId(), customerBank.getDeptId(), MemberType.CUSTOMER)); customerBank.setAdapayMemberId(AdapayUtils.getCustomerMemberId(customerBank.getCustomerId(), customerBank.getDeptId()));
return customerBankMapper.insertCustomerBank(customerBank); return customerBankMapper.insertCustomerBank(customerBank);
} }