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

update 检查订单分账记录 删除历史的分账记录

Browse Source
This commit is contained in:
bl\GQS02
2025-10-11 21:32:09 +08:00
parent 1902e877ae
commit 0027d66fa9
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5854,6 +5854,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
boolean bool = orderSplitRecordService.compareOrderSplitRecord(generatedOrderSplitRecordList, queryOrderSplitRecordList); boolean bool = orderSplitRecordService.compareOrderSplitRecord(generatedOrderSplitRecordList, queryOrderSplitRecordList);
if (!bool) { if (!bool) {
logger.info("校验或更新订单分账信息-订单:{}, 分账记录不一致, 保存分账记录", orderCode); logger.info("校验或更新订单分账信息-订单:{}, 分账记录不一致, 保存分账记录", orderCode);
// 删除历史的分账记录
orderSplitRecordService.deleteOrderSplitRecord(orderCode);
// 保存orderSplitRecords到数据库 // 保存orderSplitRecords到数据库
orderSplitRecordService.batchInsert(generatedOrderSplitRecordList); orderSplitRecordService.batchInsert(generatedOrderSplitRecordList);
} else { } else {

2
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java
View File

@@ -268,7 +268,7 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService {
return resultList; return resultList;
} }
// 根据merchantId查询汇付账户信息 // 根据merchantId查询汇付账户信息
AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); // AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId);
List<String> usedAdapayMemberIdList = adapayMemberAccountService.selectUsedAdapayMemberIdByMerchantId(merchantId); List<String> usedAdapayMemberIdList = adapayMemberAccountService.selectUsedAdapayMemberIdByMerchantId(merchantId);
// 按天分组, 组装结果集 key 为 tradeDate, value 为该天的订单分账记录 // 按天分组, 组装结果集 key 为 tradeDate, value 为该天的订单分账记录
Map<String, List<OrderSplitRecord>> dailyRecordMap = orderSplitRecords.stream().collect(Collectors.groupingBy(OrderSplitRecord::getTradeDate)); Map<String, List<OrderSplitRecord>> dailyRecordMap = orderSplitRecords.stream().collect(Collectors.groupingBy(OrderSplitRecord::getTradeDate));

10
jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java
View File

@@ -437,11 +437,11 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
} }
// 从清分账单中计算交易金额，交易手续费 // 从清分账单中计算交易金额，交易手续费
GetClearingBillDTO clearingBillDTO = GetClearingBillDTO.builder() // GetClearingBillDTO clearingBillDTO = GetClearingBillDTO.builder()
.merchantId(dto.getMerchantId()) // .merchantId(dto.getMerchantId())
.startTime(dto.getStartTime()) // .startTime(dto.getStartTime())
.endTime(dto.getEndTime()) // .endTime(dto.getEndTime())
.build(); // .build();
PageHelper.clearPage(); PageHelper.clearPage();
BigDecimal tradeAmount = BigDecimal.ZERO; BigDecimal tradeAmount = BigDecimal.ZERO;