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 db31500cd..817398ed7 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 @@ -698,7 +698,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { transactionService.doUpdateOrder(dto); // 订单支付结算and退款 - OrderSettleResult orderSettleResult = orderPaymentSettlementAndRefund(orderBasicInfo); + orderPaymentSettlementAndRefund(orderBasicInfo); // 记账 // doUpdateClearingBill(orderSettleResult); @@ -734,7 +734,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { /** * 订单分账逻辑 * 订单结算完成,就执行清分and退款 - * 清分账单生成逻辑改为当天第一笔结算后就新建,后面的产生的订单,追加更新 */ private OrderSettleResult orderPaymentSettlementAndRefund(OrderBasicInfo orderBasicInfo) { String merchantId = orderBasicInfo.getMerchantId(); @@ -762,7 +761,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { String delayMode = merchantInfo.getDelayMode(); if (StringUtils.equals(delayMode, Constants.ADAPAY_PAY_MODE_DELAY)) { // 记账 冻结金额 - freezeAmount(orderBasicInfo); + // freezeAmount(orderBasicInfo); } OrderSettleResult orderSettleResult = null;