* 会员信息-银行卡信息 - *
- * - * @author hzs - * @since 2022-08-31 */ @Data @AllArgsConstructor diff --git a/bd-api/bd-api-third/src/main/java/com/hzs/third/bankcard/IBankCardServiceApi.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/bankcard/IBankCardServiceApi.java index c7b4af3d..8fd94acc 100644 --- a/bd-api/bd-api-third/src/main/java/com/hzs/third/bankcard/IBankCardServiceApi.java +++ b/bd-api/bd-api-third/src/main/java/com/hzs/third/bankcard/IBankCardServiceApi.java @@ -5,20 +5,15 @@ import com.hzs.third.bankcard.dto.BankCardParam; /** * 银行卡四要素认证 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/9 14:04 - * @Classname: BankCardService - * @Package_name: com.hzs.third.bankCard */ public interface IBankCardServiceApi { + /** * 银行卡四要素验证 * * @param bankCardParam 银行卡入参 * @return R */ - R verifyBankCard(BankCardParam bankCardParam); + R verifyBankCard(BankCardParam bankCardParam); } diff --git a/bd-api/bd-api-third/src/main/java/com/hzs/third/bankcard/dto/BankCardParam.java b/bd-api/bd-api-third/src/main/java/com/hzs/third/bankcard/dto/BankCardParam.java index f48d6f49..b8fca756 100644 --- a/bd-api/bd-api-third/src/main/java/com/hzs/third/bankcard/dto/BankCardParam.java +++ b/bd-api/bd-api-third/src/main/java/com/hzs/third/bankcard/dto/BankCardParam.java @@ -9,12 +9,6 @@ import java.io.Serializable; /** * 银行卡校验参数 - * - * @Description: - * @Author: ljc - * @Time: 2022/11/24 18:19 - * @Classname: BankCardVO - * @Package_name: com.hz.bankCard.vo */ @Data @Builder @@ -28,12 +22,10 @@ public class BankCardParam implements Serializable { * 姓名 */ private String name; - /** * 身份证号 */ private String idCard; - /** * 手机号 */ diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java index b1ef7107..8ea43881 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/account/controller/api/ApiCuMemberBankController.java @@ -2,21 +2,14 @@ package com.hzs.member.account.controller.api; import cn.hutool.core.collection.CollUtil; import com.hzs.common.core.annotation.RepeatSubmitSimple; -import com.hzs.common.core.constant.CountryConstants; -import com.hzs.common.core.constant.msg.FinanceMsgConstants; import com.hzs.common.core.domain.R; -import com.hzs.common.core.enums.EBusinessModule; -import com.hzs.common.core.enums.EYesNo; import com.hzs.common.core.utils.StringUtils; import com.hzs.common.core.web.controller.BaseController; import com.hzs.common.core.web.domain.AjaxResult; import com.hzs.common.domain.member.account.CuMemberBank; -import com.hzs.common.domain.system.config.BdTradeWhiteConfig; import com.hzs.common.security.utils.SecurityUtils; -import com.hzs.common.util.TransactionUtils; import com.hzs.member.account.dto.CuMemberBankParam; import com.hzs.member.account.service.ICuMemberBankService; -import com.hzs.member.account.service.ICuMemberBaseService; import com.hzs.member.account.service.ICuMemberWithdrawService; import com.hzs.member.account.vo.CuMemberBankVO; import com.hzs.member.sms.service.IApiAliSmsService; @@ -37,184 +30,144 @@ import java.util.List; public class ApiCuMemberBankController extends BaseController { @Autowired - private ICuMemberBankService cuMemberBankService; + private ICuMemberBankService iCuMemberBankService; @Autowired - private ICuMemberBaseService iCuMemberBaseService; - @Autowired - private ICuMemberWithdrawService cuMemberWithdrawService; + private ICuMemberWithdrawService iCuMemberWithdrawService; @Autowired private IApiAliSmsService iApiAliSmsService; @DubboReference - IBankCardServiceApi bankCardServiceApi; - + IBankCardServiceApi iBankCardServiceApi; /** - * 是否绑定银行卡 - * - * @return AjaxResult + * 银行卡列表 */ - @GetMapping("/is-bind") - public AjaxResult isBindBank() { + @GetMapping("/list") + public AjaxResult getBankCardList() { Long pkMember = SecurityUtils.getUserId(); Integer pkCountry = SecurityUtils.getPkCountry(); - CuMemberBankVO cuMemberBank = cuMemberBankService.isBindBank(pkMember, pkCountry); - String flag = null == cuMemberBank.getDefaultCard() ? EYesNo.NO.getValue() : EYesNo.YES.getValue(); - return AjaxResult.success().put("flag", flag); - } - - /** - * 解绑银行卡 - * - * @return AjaxResult - */ - @GetMapping("/unbind-bank") - public AjaxResult unbindBank(Long pkId) { - Assert.notNull(pkId, TransactionUtils.getContent(FinanceMsgConstants.BANK_CARD_CANNOT_EMPTY)); - Integer pkCountry = SecurityUtils.getPkCountry(); - Long pkMember = SecurityUtils.getUserId(); - //查询默认银行卡 - CuMemberBankVO cuMemberBankVO = cuMemberBankService.selectCuMemberBankById(pkId); - //解绑默认银行卡需校验是否有进行的提现 - if (null != cuMemberBankVO) { - List* 会员信息-银行卡信息 Mapper 接口 - *
- * - * @author hzs - * @since 2022-08-31 */ public interface CuMemberBankMapper extends BaseMapper* 会员信息-银行卡信息 服务实现类 - *
- * - * @author hzs - * @since 2022-08-31 */ @Service public class CuMemberBankServiceImpl extends ServiceImpl* 会员信息-银行卡信息 - *
- * - * @author hzs - * @since 2022-08-31 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/bd-third/src/main/java/com/hzs/third/bankcard/common/HttpConstant.java b/bd-third/src/main/java/com/hzs/third/bankcard/common/HttpConstant.java deleted file mode 100644 index 01228656..00000000 --- a/bd-third/src/main/java/com/hzs/third/bankcard/common/HttpConstant.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.hzs.third.bankcard.common; - -import lombok.Data; - -/** - * 银行卡验证返回状态 - * - * @Description: - * @Author: ljc - * @Time: 2022/11/25 10:42 - * @Classname: HttpConstant - * @Package_name: com.hz.bankCard.common - */ -@Data -public class HttpConstant { - /** - * 一致 - */ - public static final String BANK_CARD_SAME = "1200"; - /** - * 不一致 - */ - public static final String BANK_CARD_DIFFERENT = "1201"; - - - /** - * 银行卡状态错误 - */ - public static final String BANK_CARD_STATUS_EEOR = "1203"; - - /** - * 验证失败 - */ - public static final String BANK_CARD_FAIL = "1206"; - - - /** - * 验证错误 - */ - public static final String BANK_CARD_EEOR = "1206"; - -} diff --git a/bd-third/src/main/java/com/hzs/third/bankcard/provider/BankCardValidateProvider.java b/bd-third/src/main/java/com/hzs/third/bankcard/provider/BankCardValidateProvider.java index 6fa5497c..75e4560b 100644 --- a/bd-third/src/main/java/com/hzs/third/bankcard/provider/BankCardValidateProvider.java +++ b/bd-third/src/main/java/com/hzs/third/bankcard/provider/BankCardValidateProvider.java @@ -4,29 +4,21 @@ import com.hzs.common.core.domain.R; import com.hzs.common.core.utils.StringUtils; import com.hzs.third.bankcard.IBankCardServiceApi; import com.hzs.third.bankcard.dto.BankCardParam; -import com.hzs.third.bankcard.service.BankCardService; +import com.hzs.third.bankcard.service.IBankCardService; import org.apache.dubbo.config.annotation.DubboService; import org.springframework.beans.factory.annotation.Autowired; /** * 银行卡四要素验证服务 - * - * @Description: - * @Author: ljc - * @Time: 2023/2/9 9:05 - * @Classname: BankCardValidateProvider - * @Package_name: com.hzs.third.bankCard.provider */ - @DubboService public class BankCardValidateProvider implements IBankCardServiceApi { @Autowired - BankCardService bankCardService; + private IBankCardService iBankCardService; @Override - public R verifyBankCard(BankCardParam bankCardParam) { - + public R verifyBankCard(BankCardParam bankCardParam) { if (StringUtils.isEmpty(bankCardParam.getIdCard())) { return R.fail("身份证号码不能为空！"); } @@ -36,12 +28,10 @@ public class BankCardValidateProvider implements IBankCardServiceApi { if (StringUtils.isEmpty(bankCardParam.getMobile())) { return R.fail("手机号不能为空！"); } - if (StringUtils.isEmpty(bankCardParam.getBankCard())) { return R.fail("银行卡号不能为空！"); } - return bankCardService.verifyBankCard(bankCardParam); + return iBankCardService.verifyBankCard(bankCardParam); } - } diff --git a/bd-third/src/main/java/com/hzs/third/bankcard/service/BankCardService.java b/bd-third/src/main/java/com/hzs/third/bankcard/service/IBankCardService.java similarity index 55% rename from bd-third/src/main/java/com/hzs/third/bankcard/service/BankCardService.java rename to bd-third/src/main/java/com/hzs/third/bankcard/service/IBankCardService.java index d799a331..bf98d7a7 100644 --- a/bd-third/src/main/java/com/hzs/third/bankcard/service/BankCardService.java +++ b/bd-third/src/main/java/com/hzs/third/bankcard/service/IBankCardService.java @@ -5,14 +5,8 @@ import com.hzs.third.bankcard.dto.BankCardParam; /** * 银行卡验证接口 - * - * @Description: - * @Author: ljc - * @Time: 2022/11/24 18:03 - * @Classname: BankCardService - * @Package_name: com.hz.bankCard.service.impl */ -public interface BankCardService { +public interface IBankCardService { /** * 银行卡四要素校验 @@ -20,5 +14,6 @@ public interface BankCardService { * @param bankCardParam 入参 * @return BankCardVO */ - R verifyBankCard(BankCardParam bankCardParam); + R verifyBankCard(BankCardParam bankCardParam); + } diff --git a/bd-third/src/main/java/com/hzs/third/bankcard/service/impl/BankCardServiceImpl.java b/bd-third/src/main/java/com/hzs/third/bankcard/service/impl/BankCardServiceImpl.java index e046de5e..f5743b06 100644 --- a/bd-third/src/main/java/com/hzs/third/bankcard/service/impl/BankCardServiceImpl.java +++ b/bd-third/src/main/java/com/hzs/third/bankcard/service/impl/BankCardServiceImpl.java @@ -1,16 +1,14 @@ package com.hzs.third.bankcard.service.impl; - import cn.hutool.http.Header; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import com.hzs.common.core.constant.HttpStatus; import com.hzs.common.core.domain.R; -import com.hzs.third.bankcard.common.HttpConstant; import com.hzs.third.bankcard.dto.BankCardParam; -import com.hzs.third.bankcard.service.BankCardService; +import com.hzs.third.bankcard.service.IBankCardService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -20,16 +18,10 @@ import java.util.Map; /** * 银行卡验证接口 - * - * @Description: - * @Author: ljc - * @Time: 2022/11/24 18:14 - * @Classname: BankCardServiceImpl - * @Package_name: com.hz.bankCard.service.impl */ @Slf4j @Service -public class BankCardServiceImpl implements BankCardService { +public class BankCardServiceImpl implements IBankCardService { @Value("${bankCard.url}") private String url; @@ -39,65 +31,53 @@ public class BankCardServiceImpl implements BankCardService { private String appCode; @Override - public R verifyBankCard(BankCardParam bankCardParam) { - String authorization = "APPCODE " + appCode; - HttpResponse response = HttpRequest.post(url) - .header(Header.AUTHORIZATION, authorization) - .header(Header.CONTENT_TYPE, "application/x-www-form-urlencoded; charset=UTF-8") - .form(getInParam(bankCardParam)) - .timeout(20000) - .execute(); - return parseResult(response, bankCardParam); - } + public R verifyBankCard(BankCardParam bankCardParam) { + Map
- * 1200 银行卡验证一致 收费
- * 1201 银行卡验证不一致 收费
- * 1203 银行卡状态错误 收费
- * 1206 验证失败 免费
- *
- * @param response 响应信息
- * @return bankCardVO
*/
- private R parseResult(HttpResponse response, BankCardParam bankCardParam) {
+ private R parseResult(HttpResponse response) {
String result = response.body();
- log.info("调用接口返回信息： " + result);
- if (response.getStatus() == HttpStatus.SUCCESS) {
- JsonObject resultJson = JsonParser.parseString(result).getAsJsonObject();
- //状态码
- String code = resultJson.get("code").getAsString();
- //返回信息
- String message = resultJson.get("message").getAsString();
- if (code.equals(HttpConstant.BANK_CARD_SAME)) {
- return R.ok();
+ log.info("调用银行卡认证接口返回信息： " + result);
+
+ if (HttpStatus.SUCCESS == response.getStatus()) {
+ JSONObject resultObj = JSONUtil.parseObj(result);
+ if ("200".equals(resultObj.getStr("code"))) {
+ // 返回成功
+ JSONObject dataObj = resultObj.getJSONObject("data");
+ int resultInt = dataObj.getInt("result");
+ if (resultInt == 0) {
+ // 一致
+ return R.ok();
+ } else if (resultInt == 1) {
+ // 不一致
+ return R.fail("银行卡预留信息不一致，请确认后重试");
+ } else {
+ // 查不到卡信息
+ return R.fail("银行卡信息不存在，请确认银行卡是否有效");
+ }
} else {
- log.info("银行卡四要素校验接口正常返回状态值: {},信息为: {}", code, message);
- return R.fail(message);
+ // 返回失败
+ return R.fail(resultObj.getStr("msg"));
}
} else {
- String message = "认证失败";
- log.info("银行卡四要素校验接口异常返回状态值: {},信息为: {}", response.getStatus(), message);
- return R.fail(message);
+ log.error("调用银行卡认证接口失败");
+ return R.fail("银行卡认证失败，请重试");
}
}
- /**
- * 获取入参
- *
- * @param bankCardParam 银行卡入参
- * @return String
- */
- private Map getInParam(BankCardParam bankCardParam) {
- JsonObject jsonObject = new JsonObject();
- jsonObject.addProperty("name", bankCardParam.getName());
- jsonObject.addProperty("mobile", bankCardParam.getMobile());
- jsonObject.addProperty("bankcard", bankCardParam.getBankCard());
- jsonObject.addProperty("idcard", bankCardParam.getIdCard());
- Map