From abb3d5f5701b41c5de5c330c753b58703c915189 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Mon, 31 Jul 2023 13:52:24 +0800 Subject: [PATCH] update --- .../jsowell/api/uniapp/TempController.java | 2 +- .../impl/OrderBasicInfoServiceImpl.java | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java index e15fcf995..48ad71eab 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java @@ -201,7 +201,7 @@ public class TempController extends BaseController { List dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime); for (String tradeDate : dateList) { - orderBasicInfoService.orderSplittingOperations(dto.getMerchantId(), tradeDate); + orderBasicInfoService.tempOrderSplittingOperations(dto.getMerchantId(), tradeDate); } response = new RestApiResponse<>(); 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 be8d44533..52489907f 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 @@ -1013,18 +1013,18 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { // clearingBillInfo.setOrderSource("1"); // 应收金额 - BigDecimal receivableAmount = BigDecimal.ZERO; - // 应清分金额 - BigDecimal shouldClearingAmount = BigDecimal.ZERO; - // 实际清分金额 - BigDecimal actualClearingAmount = BigDecimal.ZERO; - // 手续费金额 - BigDecimal feeAmount = BigDecimal.ZERO; - // 可提现金额 - BigDecimal withdrawableAmount = BigDecimal.ZERO; + // BigDecimal receivableAmount = BigDecimal.ZERO; + // // 应清分金额 + // BigDecimal shouldClearingAmount = BigDecimal.ZERO; + // // 实际清分金额 + // BigDecimal actualClearingAmount = BigDecimal.ZERO; + // // 手续费金额 + // BigDecimal feeAmount = BigDecimal.ZERO; + // // 可提现金额 + // BigDecimal withdrawableAmount = BigDecimal.ZERO; // 清分账单详情列表 - List billDetailList = Lists.newArrayList(); + // List billDetailList = Lists.newArrayList(); // 执行分账 for (OrderBasicInfo orderBasicInfo : orderBasicInfos) { try {