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

交易分账 重构

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-08-28 19:55:56 +08:00
parent d00686d6e8
commit f27bbdd9ff
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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