mirror of
https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git
synced 2026-04-20 11:05:18 +08:00
update pre环境也退款、分账
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user