enumEntityList = new ArrayList<>();
for (EBusinessModule value : EBusinessModule.values()) {
- enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel(), EnumsPrefixConstants.BUSINESS_MODULE));
+ enumEntityList.add(new EnumEntity(value.getValue(), value.getLabel()));
}
return AjaxResult.success(enumEntityList);
}
diff --git a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java
index a48b5deb..b3d97581 100644
--- a/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java
+++ b/bd-business/bd-business-system/src/main/java/com/hzs/system/enums/controller/EnumsInitController.java
@@ -90,7 +90,7 @@ public class EnumsInitController {
initList.add(this.createData(value.getKey(), value.getLabel()));
}
- // 等级枚举枚举
+ // 等级枚举枚举
for (EGrade value : EGrade.values()) {
initList.add(this.createData(value.getKey(), value.getLabel()));
}
@@ -587,11 +587,6 @@ public class EnumsInitController {
initList.add(this.createData(value.getKey(), value.getLabel()));
}
- // 交易配置 业务类型
- for (EBusinessModule value : EBusinessModule.values()) {
- initList.add(this.createData(value.getKey(), value.getLabel()));
- }
-
// 点位状态
for (EPointStatus value : EPointStatus.values()) {
initList.add(this.createData(value.getKey(), value.getLabel()));
diff --git a/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdWithdrawalAutoMapper.xml b/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdWithdrawalAutoMapper.xml
index 4f67ce1b..9404d999 100644
--- a/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdWithdrawalAutoMapper.xml
+++ b/bd-business/bd-business-system/src/main/resources/mapper/system/config/BdWithdrawalAutoMapper.xml
@@ -2,27 +2,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- DEL_FLAG,
- PK_COUNTRY,
- PK_CREATOR,
- CREATION_TIME,
- PK_MODIFIED,
- MODIFIED_TIME,
- PK_ID, PK_WITHDRAWAL, LOWER_BOUND, UPPER_BOUND
-
-
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java
index d3adcd4f..e69d7990 100644
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/EnumsPrefixConstants.java
@@ -816,11 +816,6 @@ public class EnumsPrefixConstants {
*/
public static final String RATIO_TYPE = "ENU_R_T_";
- /**
- * 抽奖奖品发放方式
- */
- public static final String GRANT_WAY_TYPE = "GRANT_WAY_TYPE_";
-
/**
* 数据类型(业绩查询)
*/
@@ -831,11 +826,6 @@ public class EnumsPrefixConstants {
*/
public static final String RECOMMEND_DADA_TYPE = "ENU_R_D_T_";
- /**
- * 交易配置 业务类型
- */
- public static final String BUSINESS_MODULE = "ENU_B_M_";
-
/**
* 点位状态
*/
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/FinanceMsgConstants.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/FinanceMsgConstants.java
index 27824c19..c12444c0 100644
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/FinanceMsgConstants.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/constant/msg/FinanceMsgConstants.java
@@ -125,11 +125,6 @@ public class FinanceMsgConstants {
*/
public static final String RECHAGER_IMPOR_CODE_ERROR = "编号导入有误,请核对!";
- /**
- * 导入的编号未支付,请核对! -- 导入的编号未支付,请核对!
- */
- public static final String RECHAGER_NO_PAY = "导入的编号未支付,请核对!";
-
/**
* 钱包明细导出 -- 钱包明细导出
*/
@@ -198,56 +193,16 @@ public class FinanceMsgConstants {
*/
public static final String CONFIGURE_WITHDRAWAL_INFO = "请配置提现信息";
- /**
- * 请绑定银行卡 -- 请绑定银行卡
- */
- public static final String BIND_BANK_CARD = "请绑定银行卡";
-
- /**
- * 暂时不请允许提现,请先升级 -- 暂时不请允许提现,请先升级
- */
- public static final String NOT_WITHDRAWAL_UPGRADE = "暂时不请允许提现,请先升级";
-
/**
* 请选择提现账户 -- 请选择提现账户
*/
public static final String SELECT_WITHDRAWAL_ACCOUNT = "请选择提现账户";
- /**
- * 不允许提现 -- 不允许提现
- */
- public static final String NOT_ALLOWED_WITHDRAWAL = "不允许提现";
-
- /**
- * 超过提现次数 -- 超过提现次数
- */
- public static final String EXCEEDING_WITHDRAWALS_NUMBER = "超过提现次数";
-
- /**
- * 请配置提现金额限制 -- 请配置提现金额限制
- */
- public static final String CONFIGURE_WITHDRAWAL_AMOUNT_LIMIT = "请配置提现金额限制";
-
/**
* 请输入提现金额 -- 请输入提现金额
*/
public static final String ENTER_WITHDRAWAL_AMOUNT = "请输入提现金额";
- /**
- * 请输入整数值 -- 请输入整数值
- */
- public static final String ENTER_INTEGER_VALUE = "请输入整数值";
-
- /**
- * 提现金额必须大于最低提现金额 -- 提现金额必须大于最低提现金额
- */
- public static final String WITHDRAWAL_AMOUNT_GREATER_MINIMUM_AMOUNT = "提现金额必须大于最低提现金额";
-
- /**
- * 提现金额必须小于最高提现金额 -- 提现金额必须小于最高提现金额
- */
- public static final String WITHDRAWAL_AMOUNT_LESS_MAXIMUM_AMOUNT = "提现金额必须小于最高提现金额";
-
/**
* 余额不足 -- 余额不足
*/
@@ -263,18 +218,11 @@ public class FinanceMsgConstants {
*/
public static final String TRANSFER_OUT_ACCOUNT_NOT_EMPTY = "请选择要转出的账户";
- /**
- * 转账金额有误 -- 转账金额有误
- */
- public static final String INCORRECT_TRANSFER_AMOUNT = "转账金额有误";
-
-
/**
* 转账金额不能低于0且小数位数最多只能有2位
*/
public static final String INCORRECT_TRANSFER_AMOUNT_SCALE = "转账金额不能低于0且小数位数最多只能有2位";
-
/**
* 请配置转账配置 -- 请配置转账配置
*/
@@ -293,11 +241,6 @@ public class FinanceMsgConstants {
*/
public static final String NOT_ALLOWED_TRANSFER = "该账号不允许转账";
- /**
- * 请先实名认证 -- 请先实名认证
- */
- public static final String REAL_NAME_NOT_EXIST = "请先实名认证";
-
/**
* 实名认证的真实姓名与营业执照的法人姓名是不一致 -- 法人姓名与实名认证的真实姓名不一致
*/
@@ -331,26 +274,11 @@ public class FinanceMsgConstants {
*/
public static final String RECHARGE_DETAILS_EXPORT = "充值明细导出";
- /**
- * 银行卡号不能为空 -- 银行卡号不能为空!
- */
- public static final String BANK_CARD_CANNOT_EMPTY = "银行卡号不能为空!";
-
- /**
- * 开户名不能为空 -- 开户名不能为空!
- */
- public static final String ACCOUNT_NAME_CANNOT_EMPTY = "开户名不能为空!";
-
/**
* 验证码不能为空 -- 验证码不能为空!
*/
public static final String VERIFICATION_CODE_CANNOT_EMPTY = "验证码不能为空!";
- /**
- * 开户支行不能为空 -- 开户支行不能为空!
- */
- public static final String OPENING_BRANCH_CANNOT_EMPTY = "开户支行不能为空!";
-
/**
* 开户支行不能为空 -- 真实姓名不能为空!
*/
@@ -444,16 +372,6 @@ public class FinanceMsgConstants {
*/
public static final String BUSINESS_LICENSE_REFUSE_RESET = "营业执照审核未通过,请勿操作重置";
- /**
- * 提现正在审批中,请稍后再试 -- 提现正在审批中,请稍后再试
- */
- public static final String WITHDRAWAL_APPROVAL = "提现正在审批中,请稍后再试";
-
- /**
- * 提现金额必须为100的整数倍
- */
- public static final String WITHDRAW_AMOUNT_MULTIPLE = "提现金额必须为100的整数倍";
-
/**
* 身份证的图片地址不能为空
*/
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBankCardStatus.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBankCardStatus.java
index 61c190f4..410f9701 100644
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBankCardStatus.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBankCardStatus.java
@@ -5,12 +5,6 @@ import lombok.Getter;
/**
* 银行卡默认状态
- *
- * @Description:
- * @Author: ljc
- * @Time: 2023/2/9 15:14
- * @Classname: EBankCardStatus
- * @Package_name: com.hzs.common.core.enums
*/
@Getter
@AllArgsConstructor
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBusinessModule.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBusinessModule.java
index 91130611..801297d0 100644
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBusinessModule.java
+++ b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EBusinessModule.java
@@ -1,17 +1,10 @@
package com.hzs.common.core.enums;
-import com.hzs.common.core.constant.EnumsPrefixConstants;
import lombok.AllArgsConstructor;
import lombok.Getter;
/**
* 交易配置 业务类型
- *
- * @Description:
- * @Author: ljc
- * @Time: 2023/8/18 10:01
- * @Classname: EBusinessModule
- * @Package_name: com.hzs.common.core.enums
*/
@AllArgsConstructor
@Getter
@@ -20,11 +13,11 @@ public enum EBusinessModule {
/**
* 1=提现
*/
- WITHDRAWAL(1, "提现", 0, EnumsPrefixConstants.BUSINESS_MODULE + "1"),
+ WITHDRAWAL(1, "提现", 0),
/**
* 2=转账
*/
- TRANSFER_ACCOUNTS(2, "转账", 0, EnumsPrefixConstants.BUSINESS_MODULE + "2"),
+ TRANSFER_ACCOUNTS(2, "转账", 0),
;
@@ -40,9 +33,5 @@ public enum EBusinessModule {
* 是否启用(0=是,1=否) -- 来源EYesNo
*/
private final int enable;
- /**
- * 国际化翻译key值
- */
- private final String key;
}
diff --git a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrantWay.java b/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrantWay.java
deleted file mode 100644
index afc00e92..00000000
--- a/bd-common/bd-common-core/src/main/java/com/hzs/common/core/enums/EGrantWay.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.hzs.common.core.enums;
-
-import com.hzs.common.core.constant.EnumsPrefixConstants;
-import lombok.AllArgsConstructor;
-import lombok.Getter;
-
-/**
- * @Description:
- * @Author: yuhui
- * @Time: 2023/5/15 10:57
- * @Classname: EGrantWay
- * @PackageName: com.hzs.common.core.enums
- */
-@AllArgsConstructor
-@Getter
-public enum EGrantWay {
- /**
- * 商品展示
- */
- TYPE_0(0, "实物", 0, EnumsPrefixConstants.GRANT_WAY_TYPE + "0"),
-
- TYPE_1(1, "消费账户", 0, EnumsPrefixConstants.GRANT_WAY_TYPE + "1"),
-
- TYPE_2(2, "现金账户", 0, EnumsPrefixConstants.GRANT_WAY_TYPE + "2"),
-
- TYPE_6(6, "积分账户", 0, EnumsPrefixConstants.GRANT_WAY_TYPE + "6"),
-
- TYPE_8(8, "复购券", 0, EnumsPrefixConstants.GRANT_WAY_TYPE + "8"),
-
- TYPE_11(11, "直播代金券", 0, EnumsPrefixConstants.GRANT_WAY_TYPE + "11");
-
-
- /**
- * 实际值
- */
- private final int value;
- /**
- * 显示标签
- */
- private final String label;
- /**
- * 是否启用(0=是,1=否) -- 来源EYesNo
- */
- private final int enable;
- /**
- * 国际化翻译key值
- */
- private final String key;
-}
diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/account/CuMemberBank.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/account/CuMemberBank.java
index eb961803..4b3bf74e 100644
--- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/account/CuMemberBank.java
+++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/member/account/CuMemberBank.java
@@ -11,12 +11,7 @@ import lombok.experimental.Accessors;
import java.util.Date;
/**
- *
* 会员信息-银行卡信息
- *
- *
- * @author hzs
- * @since 2022-08-31
*/
@Data
@EqualsAndHashCode(callSuper = true)
diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdWithdrawalAuto.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdWithdrawalAuto.java
index a7d2b632..063b2071 100644
--- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdWithdrawalAuto.java
+++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/system/config/BdWithdrawalAuto.java
@@ -12,12 +12,7 @@ import lombok.experimental.Accessors;
import java.math.BigDecimal;
/**
- *
* 自动提现明细表
- *
- *
- * @author zhangjing
- * @since 2022-08-31
*/
@Data
@EqualsAndHashCode(callSuper = true)
@@ -47,5 +42,4 @@ public class BdWithdrawalAuto extends BaseEntity {
private Integer withdrawalCycle;
-
}
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..6ea29dfe 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
deleted file mode 100644
index e046de5e..00000000
--- a/bd-third/src/main/java/com/hzs/third/bankcard/service/impl/BankCardServiceImpl.java
+++ /dev/null
@@ -1,103 +0,0 @@
-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 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 lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-
-import java.util.HashMap;
-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 {
-
- @Value("${bankCard.url}")
- private String url;
- @Value("${bankCard.appKey}")
- private String appKey;
- @Value("${bankCard.appCode}")
- 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);
- }
-
-
- /**
- * 解析返回的结果集
- *
- * 1200 银行卡验证一致 收费
- * 1201 银行卡验证不一致 收费
- * 1203 银行卡状态错误 收费
- * 1206 验证失败 免费
- *
- * @param response 响应信息
- * @return bankCardVO
- */
- private R parseResult(HttpResponse response, BankCardParam bankCardParam) {
- 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();
- } else {
- log.info("银行卡四要素校验接口正常返回状态值: {},信息为: {}", code, message);
- return R.fail(message);
- }
- } else {
- String message = "认证失败";
- log.info("银行卡四要素校验接口异常返回状态值: {},信息为: {}", response.getStatus(), message);
- return R.fail(message);
- }
- }
-
- /**
- * 获取入参
- *
- * @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 param = new HashMap<>();
- param.put("biz_content", jsonObject.toString());
- return param;
- }
-}
diff --git a/bd-third/src/main/java/com/hzs/third/bankcard/service/impl/IBankCardServiceImpl.java b/bd-third/src/main/java/com/hzs/third/bankcard/service/impl/IBankCardServiceImpl.java
new file mode 100644
index 00000000..d48f3dd2
--- /dev/null
+++ b/bd-third/src/main/java/com/hzs/third/bankcard/service/impl/IBankCardServiceImpl.java
@@ -0,0 +1,83 @@
+package com.hzs.third.bankcard.service.impl;
+
+import cn.hutool.http.Header;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpResponse;
+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.dto.BankCardParam;
+import com.hzs.third.bankcard.service.IBankCardService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 银行卡验证接口
+ */
+@Slf4j
+@Service
+public class IBankCardServiceImpl implements IBankCardService {
+
+ @Value("${bankCard.url}")
+ private String url;
+ @Value("${bankCard.appKey}")
+ private String appKey;
+ @Value("${bankCard.appCode}")
+ private String appCode;
+
+ @Override
+ public R> verifyBankCard(BankCardParam bankCardParam) {
+ Map param = new HashMap<>();
+ param.put("bankcard", bankCardParam.getBankCard());
+ param.put("idcard", bankCardParam.getIdCard());
+ param.put("name", bankCardParam.getName());
+ param.put("mobile", bankCardParam.getMobile());
+
+ HttpResponse response = HttpRequest.post(url)
+ .header(Header.AUTHORIZATION, "APPCODE " + appCode)
+ .header(Header.CONTENT_TYPE, "application/x-www-form-urlencoded; charset=UTF-8")
+ .form(param)
+ .timeout(10000)
+ .execute();
+ return parseResult(response);
+ }
+
+ /**
+ * 解析返回的结果集
+ */
+ private R> parseResult(HttpResponse response) {
+ String result = response.body();
+ 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 {
+ // 返回失败
+ return R.fail(resultObj.getStr("msg"));
+ }
+ } else {
+ log.error("调用银行卡认证接口失败");
+ return R.fail("银行卡认证失败,请重试");
+ }
+ }
+
+}
diff --git a/bd-third/src/main/java/com/hzs/third/express/service/impl/ExpressServiceImpl.java b/bd-third/src/main/java/com/hzs/third/express/service/impl/ExpressServiceImpl.java
index c194b376..88def8ca 100644
--- a/bd-third/src/main/java/com/hzs/third/express/service/impl/ExpressServiceImpl.java
+++ b/bd-third/src/main/java/com/hzs/third/express/service/impl/ExpressServiceImpl.java
@@ -20,12 +20,8 @@ import java.util.List;
import java.util.Map;
/**
- * @Description: 快递100
- * @Author: ljc
- * @Date: 2022/8/24 14:38
- * @Version:1.0
+ * 快递100
*/
-
@Service
@Slf4j
public class ExpressServiceImpl implements IExpressService {
@@ -33,7 +29,6 @@ public class ExpressServiceImpl implements IExpressService {
@Autowired
private ExpressConfig expressConfig;
-
@Override
public R expressTrackInfo(String trackingNumber, String mobile) {
String customer = expressConfig.getCustomer();
@@ -41,7 +36,6 @@ public class ExpressServiceImpl implements IExpressService {
String url = expressConfig.getUrl();
QueryTrackParam queryTrackParam = new QueryTrackParam();
- // queryTrackParam.setCom("JD");
queryTrackParam.setNum(trackingNumber);
queryTrackParam.setPhone(mobile);
String param = new Gson().toJson(queryTrackParam);
@@ -119,10 +113,9 @@ public class ExpressServiceImpl implements IExpressService {
* @return String
*/
private String querySign(String param, String key, String customer) {
- StringBuilder sb = new StringBuilder();
- sb.append(param);
- sb.append(key);
- sb.append(customer);
- return sign(sb.toString());
+ String sb = param +
+ key +
+ customer;
+ return sign(sb);
}
}