autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-06-29 19:47:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 重试订单退款接口

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-17 15:05:01 +08:00
parent 205cdce2be
commit fb3588c565
2 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
jsowell-common/src/main/java/com/jsowell/common/enums/ykc/ReturnCodeEnum.java
View File

@@ -112,6 +112,7 @@ public enum ReturnCodeEnum {
CODE_ADAPAY_CONFIG_IS_NULL_ERROR("00100052", "获取支付配置信息异常"), CODE_ADAPAY_CONFIG_IS_NULL_ERROR("00100052", "获取支付配置信息异常"),
CODE_ORDER_HAS_BEEN_REFUNDED("00100053", "订单已退款，请等待收单机构原路返回，交易将在1-3个工作日完成，感谢您的理解"),
/* 个人桩 start */ /* 个人桩 start */

20
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java
View File

@@ -2761,10 +2761,13 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// 发送启动指令 // 发送启动指令
pileRemoteService.remoteStartCharging(pileSn, orderInfo.getConnectorCode(), orderInfo.getTransactionCode(), orderInfo.getPayAmount()); pileRemoteService.remoteStartCharging(pileSn, orderInfo.getConnectorCode(), orderInfo.getTransactionCode(), orderInfo.getPayAmount());
} }
} }
/**
* 重试订单退款
* @param orderCode 订单编号
* @throws BaseAdaPayException
*/
@Override @Override
public void retryRefundOrder(String orderCode) throws BaseAdaPayException { public void retryRefundOrder(String orderCode) throws BaseAdaPayException {
// 查询订单信息 // 查询订单信息
@@ -2775,7 +2778,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// 如果该订单是订单完成状态，并且是微信支付 存在需要退款金额，则进行后续操作 // 如果该订单是订单完成状态，并且是微信支付 存在需要退款金额，则进行后续操作
String orderStatus = orderBasicInfo.getOrderStatus(); String orderStatus = orderBasicInfo.getOrderStatus();
if (!StringUtils.equals(orderStatus, OrderStatusEnum.ORDER_COMPLETE.getValue())) { if (!StringUtils.equals(orderStatus, OrderStatusEnum.ORDER_COMPLETE.getValue())) {
throw new BusinessException("", "订单不是完成状态"); throw new BusinessException("", "订单状态不是完成状态");
} }
String payMode = orderBasicInfo.getPayMode(); String payMode = orderBasicInfo.getPayMode();
if (!StringUtils.equals(payMode, OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) { if (!StringUtils.equals(payMode, OrderPayModeEnum.PAYMENT_OF_WECHATPAY.getValue())) {
@@ -2802,6 +2805,17 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
paymentId, refundAmount, wechatAppId, memberId, ScenarioEnum.ORDER.getValue(), paymentId, refundAmount, wechatAppId, memberId, ScenarioEnum.ORDER.getValue(),
orderCode); orderCode);
logger.info("重试订单退款response:{}", JSON.toJSONString(response)); logger.info("重试订单退款response:{}", JSON.toJSONString(response));
} else {
BigDecimal reversedAmt = BigDecimal.ZERO;
for (PaymentReverseResponse paymentRevers : paymentReverses) {
if (new BigDecimal(paymentRevers.getReversed_amt()).compareTo(reversedAmt) > 0) {
reversedAmt = new BigDecimal(paymentRevers.getReversed_amt());
}
}
// 如果历史撤销金额 等于 订单退款金额，则提示已经退款请耐心等待
if (reversedAmt.compareTo(refundAmount) == 0) {
throw new BusinessException(ReturnCodeEnum.CODE_ORDER_HAS_BEEN_REFUNDED);
}
} }
} }