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

update

Browse Source
This commit is contained in:
autumn.g@foxmail.com
2023-07-31 13:52:24 +08:00
parent ee630c5680
commit abb3d5f570
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java
View File

@@ -201,7 +201,7 @@ public class TempController extends BaseController {
List<String> dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime); List<String> dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime);
for (String tradeDate : dateList) { for (String tradeDate : dateList) {
orderBasicInfoService.orderSplittingOperations(dto.getMerchantId(), tradeDate); orderBasicInfoService.tempOrderSplittingOperations(dto.getMerchantId(), tradeDate);
} }
response = new RestApiResponse<>(); response = new RestApiResponse<>();

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

@@ -1013,18 +1013,18 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
// clearingBillInfo.setOrderSource("1"); // clearingBillInfo.setOrderSource("1");
// 应收金额 // 应收金额
BigDecimal receivableAmount = BigDecimal.ZERO; // BigDecimal receivableAmount = BigDecimal.ZERO;
// 应清分金额 // // 应清分金额
BigDecimal shouldClearingAmount = BigDecimal.ZERO; // BigDecimal shouldClearingAmount = BigDecimal.ZERO;
// 实际清分金额 // // 实际清分金额
BigDecimal actualClearingAmount = BigDecimal.ZERO; // BigDecimal actualClearingAmount = BigDecimal.ZERO;
// 手续费金额 // // 手续费金额
BigDecimal feeAmount = BigDecimal.ZERO; // BigDecimal feeAmount = BigDecimal.ZERO;
// 可提现金额 // // 可提现金额
BigDecimal withdrawableAmount = BigDecimal.ZERO; // BigDecimal withdrawableAmount = BigDecimal.ZERO;
// 清分账单详情列表 // 清分账单详情列表
List<ClearingBillDetail> billDetailList = Lists.newArrayList(); // List<ClearingBillDetail> billDetailList = Lists.newArrayList();
// 执行分账 // 执行分账
for (OrderBasicInfo orderBasicInfo : orderBasicInfos) { for (OrderBasicInfo orderBasicInfo : orderBasicInfos) {
try { try {