diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerBankController.java b/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerBankController.java index 5e63dac7..c7f98d5a 100644 --- a/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerBankController.java +++ b/ghy-admin/src/main/java/com/ghy/web/controller/customer/CustomerBankController.java @@ -3,7 +3,6 @@ package com.ghy.web.controller.customer; import com.alibaba.fastjson.JSON; import com.ghy.common.adapay.AdapayConfig; 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.Merchant; import com.ghy.common.core.domain.AjaxResult; @@ -44,7 +43,7 @@ public class CustomerBankController { private AjaxResult bindBankCard(@RequestBody BindBankCardRequest request) throws BaseAdaPayException { Set merchants = AdapayConfig.getMerchants(); for (Merchant merchant : merchants) { - String memberId = AdapayUtils.getMemberId(request.getCustomerId(), merchant.getDeptId(), MemberType.CUSTOMER); + String memberId = AdapayUtils.getCustomerMemberId(request.getCustomerId(), merchant.getDeptId()); // 先在Adapay创建实名用户 Map result1 = adapayService.createMember(merchant.getDeptId(), memberId, request.getPhone(), request.getName(), request.getCertId(), null, null, null, null); diff --git a/ghy-common/src/main/java/com/ghy/common/adapay/MemberType.java b/ghy-common/src/main/java/com/ghy/common/adapay/MemberType.java deleted file mode 100644 index d264eafd..00000000 --- a/ghy-common/src/main/java/com/ghy/common/adapay/MemberType.java +++ /dev/null @@ -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; - } -} diff --git a/ghy-common/src/main/java/com/ghy/common/utils/AdapayUtils.java b/ghy-common/src/main/java/com/ghy/common/utils/AdapayUtils.java index 06249f5d..b09cfd76 100644 --- a/ghy-common/src/main/java/com/ghy/common/utils/AdapayUtils.java +++ b/ghy-common/src/main/java/com/ghy/common/utils/AdapayUtils.java @@ -9,14 +9,23 @@ import org.springframework.util.Assert; @Slf4j public class AdapayUtils { - public static String getMemberId(Long memberId, Long deptId) { - Assert.isTrue(Math.min(memberId, deptId) > 0, "Invalid [memberId] or [deptId]"); - return String.format("C%dD%d", memberId, deptId); + /** + * 生成 Adapay member_id + * + * @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 deptId 分平台id + * @param deptId 分平台id * @return 生成的唯一id */ public static String getWorkerMemberId(Long workerId, Long deptId) { diff --git a/ghy-custom/src/main/java/com/ghy/customer/service/impl/CustomerBankServiceImpl.java b/ghy-custom/src/main/java/com/ghy/customer/service/impl/CustomerBankServiceImpl.java index f8a44707..e17355f5 100644 --- a/ghy-custom/src/main/java/com/ghy/customer/service/impl/CustomerBankServiceImpl.java +++ b/ghy-custom/src/main/java/com/ghy/customer/service/impl/CustomerBankServiceImpl.java @@ -1,6 +1,5 @@ package com.ghy.customer.service.impl; -import com.ghy.common.adapay.MemberType; import com.ghy.common.utils.AdapayUtils; import com.ghy.customer.domain.CustomerBank; import com.ghy.customer.mapper.CustomerBankMapper; @@ -46,7 +45,7 @@ public class CustomerBankServiceImpl implements CustomerBankService { @Override 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); }