backend/java-mall
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

配置增加微信的费率，优化入驻长期身份证的号码为9999-12-31

Browse Source
This commit is contained in:
Jack 2025-06-03 10:09:34 +08:00
parent b7ee0055f7
commit 186e6a59e8
9 changed files with 49 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mall-common/src/main/java/com/suisung/mall/common/exception/GlobalExceptionHandler.java
View File

@ -21,8 +21,6 @@ public class GlobalExceptionHandler {
@ExceptionHandler(value = Exception.class)
public CommonResult exceptionHandler(HttpServletRequest req, Exception e) {
// 获取异常的第一帧堆栈信息
StackTraceElement[] stackTrace = e.getStackTrace();
String location = "未知位置";
@ -42,28 +40,17 @@ public class GlobalExceptionHandler {
location,
e);
return CommonResult.failed("系统异常：" + location);
// logger.error("Exception全局异常捕获-" + e.getMessage(), e);
// return CommonResult.failed();
return CommonResult.failed("系统异常：" + e.getMessage());
}
@ExceptionHandler(value = ApiException.class)
public CommonResult exceptionHandler(HttpServletRequest req, ApiException e) {
// IErrorCode errorCode = e.getErrorCode();
// String message = e.getMessage();
// logger.error("ApiException全局异常捕获-" + e.getMessage(), e);
// if (errorCode != null) {
// return CommonResult.failed(errorCode);
// } else if (StrUtil.isNotBlank(message)) {
// return CommonResult.failed(message);
// } else {
// return CommonResult.failed(ResultCode.FAILED);
// }
// 获取异常位置信息
StackTraceElement[] stackTrace = e.getStackTrace();
String location = "未知位置";
String location = "未知错误位置";
IErrorCode errorCode = e.getErrorCode();
String message = e.getMessage();
if (stackTrace.length > 0) {
StackTraceElement element = stackTrace[0]; // 第一个异常抛出点
@ -74,20 +61,18 @@ public class GlobalExceptionHandler {
);
}
IErrorCode errorCode = e.getErrorCode();
String message = e.getMessage();
logger.error("Exception全局异常捕获 URI:{} - Method:{} - Error:{} at {}",
req.getRequestURI(),
req.getMethod(),
e.getMessage(),
message,
location,
e);
if (errorCode != null) {
return CommonResult.failed(errorCode);
return CommonResult.failed(message);
} else if (StrUtil.isNotBlank(message)) {
return CommonResult.failed("业务异常：" + message + " [" + location + "]");
return CommonResult.failed("系统异常：" + message + " [" + location + "]");
} else {
return CommonResult.failed(ResultCode.FAILED);
}

8
mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LakalaApiServiceImpl.java
View File

@ -89,6 +89,8 @@ public class LakalaApiServiceImpl implements LakalaApiService {
private String orgCode;
@Value("${lakala.tk.split_lowest_ratio}")
private String splitLowestRatio;
@Value("${lakala.tk.wx_fee}")
private String wxFee;
@Value("${project.domain}")
private String projectDomain;
@Value("${spring.profiles.active}")
@ -546,13 +548,9 @@ public class LakalaApiServiceImpl implements LakalaApiService {
String signDate = today.getYear() + "-" + today.getMonthValue() + "-" + today.getDayOfMonth();
String platformName = "桂平发发网络有限公司";
String ratioNum = "0.6";
if (isLklProd) {
ratioNum = "0.25";
}
JSONObject ecParams = new JSONObject();
ecParams.put("A1", isQy ? shopMchEntry.getBiz_license_company() : shopMchEntry.getAccount_holder_name());
ecParams.put("A30", ratioNum); // 测试环境微信费率0.6
ecParams.put("A30", wxFee); // 测试环境微信费率0.6
ecParams.put("A96", "1");
ecParams.put("A97", "是");
ecParams.put("A100", "是");

7
mall-shop/src/main/java/com/suisung/mall/shop/lakala/service/impl/LklTkServiceImpl.java
View File

@ -68,6 +68,9 @@ public class LklTkServiceImpl {
@Value("${lakala.tk.notify_pub_key_path}")
private String notifyPubKeyPath;
@Value("${lakala.tk.wx_fee}")
private String wxFee;
@Value("${spring.profiles.active}")
private String profile;
@ -398,7 +401,7 @@ public class LklTkServiceImpl {
formData.put("countyCode", areaCode.get("countyCode"));
}
//结算信息省市信息
//银行结算信息省市信息
if (StrUtil.isBlank(shopMchEntry.getBank_district()) || StrUtil.isBlank(shopMchEntry.getBank_area())) {
Map<String, Object> bankInfo = lklBanksService.GetLklBankByBranchBankNo(shopMchEntry.getOpenning_bank_code());
if (ObjectUtil.isNotEmpty(bankInfo)) {
@ -439,7 +442,7 @@ public class LklTkServiceImpl {
put(new JSONObject() {
{
put("feeCode", "WECHAT");
put("feeValue", 0.6);
put("feeValue", wxFee);
}
});
}});

34
mall-shop/src/main/java/com/suisung/mall/shop/store/service/impl/ShopMchEntryServiceImpl.java
View File

@ -166,16 +166,26 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
// 检查企业、法人或个人的营业执照或身份证
if (ObjectUtil.isNotEmpty(record.getEntity_type()) && record.getEntity_type().equals(2)) {
if (ObjectUtil.isNotEmpty(record.getEntity_type()) && record.getEntity_type().equals(CommonConstant.MCH_ENTITY_TYPE_GR)) {
// 个人
if (StrUtil.isBlank(record.getIndividual_id_number()) || StrUtil.isBlank(record.getIndividual_id_images()) || StrUtil.isBlank(record.getIndividual_id_images2())) {
if (StrUtil.isBlank(record.getIndividual_id_number())
|| StrUtil.isBlank(record.getIndividual_id_name())
|| StrUtil.isBlank(record.getIndividual_id_addr())
|| StrUtil.isBlank(record.getIndividual_id_period_begin())
|| StrUtil.isBlank(record.getIndividual_id_period_end())
|| StrUtil.isBlank(record.getIndividual_id_images())
|| StrUtil.isBlank(record.getIndividual_id_images2())) {
return CommonResult.failed("缺少个人身份证信息！");
}
if (StrUtil.isNotBlank(record.getIndividual_id_number()) && !StringUtils.validateIDCard(record.getIndividual_id_number())) {
if (!StringUtils.validateIDCard(record.getIndividual_id_number())) {
return CommonResult.failed("个人身份证号码有误！");
}
if (StrUtil.contains(record.getIndividual_id_period_end(), "长期")) {
record.setIndividual_id_period_end("9999-12-31");
}
} else {
// 企业
if (StrUtil.isBlank(record.getBiz_license_number()) || StrUtil.isBlank(record.getBiz_license_image())) {
@ -186,17 +196,27 @@ public class ShopMchEntryServiceImpl extends BaseServiceImpl<ShopMchEntryMapper,
return CommonResult.failed("营业执照号码有误！");
}
if (StrUtil.isBlank(record.getLegal_person_id_images()) || StrUtil.isBlank(record.getLegal_person_id_images2())) {
return CommonResult.failed("法人身份证信息！");
if (StrUtil.isBlank(record.getLegal_person_id_number())
|| StrUtil.isBlank(record.getLegal_person_name())
|| StrUtil.isBlank(record.getLegal_person_id_addr())
|| StrUtil.isBlank(record.getLegal_person_id_period_begin())
|| StrUtil.isBlank(record.getLegal_person_id_period_end())
|| StrUtil.isBlank(record.getLegal_person_id_images())
|| StrUtil.isBlank(record.getLegal_person_id_images2())) {
return CommonResult.failed("缺少法人身份证信息！");
}
if (StrUtil.isNotBlank(record.getLegal_person_id_number()) && !StringUtils.validateIDCard(record.getLegal_person_id_number())) {
if (!StringUtils.validateIDCard(record.getLegal_person_id_number())) {
return CommonResult.failed("法人身份证号码有误！");
}
if (StrUtil.isNotBlank(record.getLegal_person_mobile()) && !PhoneNumberUtils.checkPhoneNumber(record.getLegal_person_mobile())) {
if (!PhoneNumberUtils.checkPhoneNumber(record.getLegal_person_mobile())) {
return CommonResult.failed("法人手机号码有误！");
}
if (StrUtil.contains(record.getLegal_person_id_period_end(), "长期")) {
record.setLegal_person_id_period_end("9999-12-31");
}
}
// 检查银行账号

1
mall-shop/src/main/resources/bootstrap-dev.yml
View File

@ -169,6 +169,7 @@ lakala:
client_secret: XPa1HB5d55Ig0qV8
user_no: 29153396
ratio: 70.00
wx_fee: 0.6 # 微信手续费 6/1000
api_pub_key_path: payKey/lakala/dev/tk_api_public_key.txt
api_pri_key_path: payKey/lakala/dev/tk_api_private_key.txt
notify_pub_key_path: payKey/lakala/dev/tk_notify_public_key.txt

1
mall-shop/src/main/resources/bootstrap-local.yml
View File

@ -171,6 +171,7 @@ lakala:
client_secret: XPa1HB5d55Ig0qV8
user_no: 29153396
split_lowest_ratio: 70.00
wx_fee: 0.6 # 微信手续费 6/1000
api_pub_key_path: payKey/lakala/dev/tk_api_public_key.txt
api_pri_key_path: payKey/lakala/dev/tk_api_private_key.txt
notify_pub_key_path: payKey/lakala/dev/tk_notify_public_key.txt

1
mall-shop/src/main/resources/bootstrap-prod.yml
View File

@ -198,6 +198,7 @@ lakala:
client_secret: XPa1HB5d55Ig0qV8
user_no: 29153396
split_lowest_ratio: 70.00
wx_fee: 0.6 # 微信手续费 6/1000
api_pub_key_path: payKey/lakala/dev/tk_api_public_key.txt
api_pri_key_path: payKey/lakala/dev/tk_api_private_key.txt
notify_pub_key_path: payKey/lakala/dev/tk_notify_public_key.txt

1
mall-shop/src/main/resources/bootstrap-test.yml
View File

@ -173,6 +173,7 @@ lakala:
client_secret: XPa1HB5d55Ig0qV8
user_no: 29153396
ratio: 70.00
wx_fee: 0.6 # 微信手续费 6/1000
api_pub_key_path: payKey/lakala/dev/tk_api_public_key.txt
api_pri_key_path: payKey/lakala/dev/tk_api_private_key.txt
notify_pub_key_path: payKey/lakala/dev/tk_notify_public_key.txt

1
mall-shop/src/main/resources/bootstrap-uat.yml
View File

@ -173,6 +173,7 @@ lakala:
client_secret: XPa1HB5d55Ig0qV8
user_no: 29153396
ratio: 70.00
wx_fee: 0.6 # 微信手续费 6/1000
api_pub_key_path: payKey/lakala/dev/tk_api_public_key.txt
api_pri_key_path: payKey/lakala/dev/tk_api_private_key.txt
notify_pub_key_path: payKey/lakala/dev/tk_notify_public_key.txt