autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-07-04 22:18:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

update pre环境也退款、分账

Browse Source
This commit is contained in:
Lemon
2025-09-16 16:01:35 +08:00
parent c54a07ad40
commit 625a17d351
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jsowell-admin/src/test/java/PaymentTestController.java
View File

@@ -539,10 +539,10 @@ public class PaymentTestController {
*/ */
@Test @Test
public void createPaymentReverseRequestTest() { public void createPaymentReverseRequestTest() {
String paymentId = "002212025040208183810753300530720288768"; String paymentId = "002212025091615421510813930946193444864";
BigDecimal refundAmount = new BigDecimal("33.55"); BigDecimal refundAmount = new BigDecimal("0.5");
String memberId = "61212331"; String memberId = "65622699";
String orderCode = "C25747230823"; String orderCode = "C67588633864";
// 延迟分账未确认调撤销调撤销接口退款 // 延迟分账未确认调撤销调撤销接口退款
PaymentReverseOperation operation = new PaymentReverseOperation(); PaymentReverseOperation operation = new PaymentReverseOperation();

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

@@ -2050,11 +2050,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
logger.info("执行订单分账/新分账方法, orderCode:{}, 分账金额:{}", logger.info("执行订单分账/新分账方法, orderCode:{}, 分账金额:{}",
afterSettleOrderDTO.getOrderCode(), afterSettleOrderDTO.getOrderSettleAmount()); afterSettleOrderDTO.getOrderCode(), afterSettleOrderDTO.getOrderSettleAmount());
// 如果是PRE环境, 直接返回 // 如果是PRE环境, 直接返回
String env = SpringUtils.getActiveProfile(); // String env = SpringUtils.getActiveProfile();
if (StringUtils.equalsIgnoreCase(env, "pre")) { // if (StringUtils.equalsIgnoreCase(env, "pre")) {
logger.debug("PRE环境不执行"); // logger.debug("PRE环境不执行");
// return null; // // return null;
} // }
// 结算金额 // 结算金额
BigDecimal orderSettleAmount = afterSettleOrderDTO.getOrderSettleAmount(); BigDecimal orderSettleAmount = afterSettleOrderDTO.getOrderSettleAmount();
@@ -2414,11 +2414,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
logger.info("执行订单退款/新退款方法, orderCode:{}, 退款金额:{}, dto:{}", logger.info("执行订单退款/新退款方法, orderCode:{}, 退款金额:{}, dto:{}",
afterSettleOrderDTO.getOrderCode(), afterSettleOrderDTO.getOrderRefundAmount(), JSON.toJSONString(afterSettleOrderDTO)); afterSettleOrderDTO.getOrderCode(), afterSettleOrderDTO.getOrderRefundAmount(), JSON.toJSONString(afterSettleOrderDTO));
// 如果是PRE环境, 直接返回 // 如果是PRE环境, 直接返回
String env = SpringUtils.getActiveProfile(); // String env = SpringUtils.getActiveProfile();
if (StringUtils.equalsIgnoreCase(env, "pre")) { // if (StringUtils.equalsIgnoreCase(env, "pre")) {
logger.debug("PRE环境不执行"); // logger.debug("PRE环境不执行");
// return; // // return;
} // }
// 退款 // 退款
String mode = pileMerchantInfoService.getDelayModeByMerchantId(afterSettleOrderDTO.getMerchantId()); String mode = pileMerchantInfoService.getDelayModeByMerchantId(afterSettleOrderDTO.getMerchantId());
AbstractProgramLogic orderLogic = ProgramLogicFactory.getProgramLogic(mode); AbstractProgramLogic orderLogic = ProgramLogicFactory.getProgramLogic(mode);