diff --git a/jsowell-admin/src/test/java/PaymentTestController.java b/jsowell-admin/src/test/java/PaymentTestController.java index cde8075a1..74e3be056 100644 --- a/jsowell-admin/src/test/java/PaymentTestController.java +++ b/jsowell-admin/src/test/java/PaymentTestController.java @@ -539,10 +539,10 @@ public class PaymentTestController { */ @Test public void createPaymentReverseRequestTest() { - String paymentId = "002212025040208183810753300530720288768"; - BigDecimal refundAmount = new BigDecimal("33.55"); - String memberId = "61212331"; - String orderCode = "C25747230823"; + String paymentId = "002212025091615421510813930946193444864"; + BigDecimal refundAmount = new BigDecimal("0.5"); + String memberId = "65622699"; + String orderCode = "C67588633864"; // 延迟分账未确认调撤销调撤销接口退款 PaymentReverseOperation operation = new PaymentReverseOperation(); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 98155fc1a..e337515ca 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -2050,11 +2050,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { logger.info("执行订单分账/新分账方法, orderCode:{}, 分账金额:{}", afterSettleOrderDTO.getOrderCode(), afterSettleOrderDTO.getOrderSettleAmount()); // 如果是PRE环境, 直接返回 - String env = SpringUtils.getActiveProfile(); - if (StringUtils.equalsIgnoreCase(env, "pre")) { - logger.debug("PRE环境不执行"); - // return null; - } + // String env = SpringUtils.getActiveProfile(); + // if (StringUtils.equalsIgnoreCase(env, "pre")) { + // logger.debug("PRE环境不执行"); + // // return null; + // } // 结算金额 BigDecimal orderSettleAmount = afterSettleOrderDTO.getOrderSettleAmount(); @@ -2414,11 +2414,11 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { logger.info("执行订单退款/新退款方法, orderCode:{}, 退款金额:{}, dto:{}", afterSettleOrderDTO.getOrderCode(), afterSettleOrderDTO.getOrderRefundAmount(), JSON.toJSONString(afterSettleOrderDTO)); // 如果是PRE环境, 直接返回 - String env = SpringUtils.getActiveProfile(); - if (StringUtils.equalsIgnoreCase(env, "pre")) { - logger.debug("PRE环境不执行"); - // return; - } + // String env = SpringUtils.getActiveProfile(); + // if (StringUtils.equalsIgnoreCase(env, "pre")) { + // logger.debug("PRE环境不执行"); + // // return; + // } // 退款 String mode = pileMerchantInfoService.getDelayModeByMerchantId(afterSettleOrderDTO.getMerchantId()); AbstractProgramLogic orderLogic = ProgramLogicFactory.getProgramLogic(mode);