From 0027d66fa9d09a600ca2e97f262f8bc6e1c02574 Mon Sep 17 00:00:00 2001 From: "bl\\GQS02" Date: Sat, 11 Oct 2025 21:32:09 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A3=80=E6=9F=A5=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E5=88=86=E8=B4=A6=E8=AE=B0=E5=BD=95=20=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=9A=84=E5=88=86=E8=B4=A6=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/service/impl/OrderBasicInfoServiceImpl.java | 2 ++ .../pile/service/impl/OrderSplitRecordServiceImpl.java | 2 +- .../service/impl/SettleOrderReportServiceImpl.java | 10 +++++----- 3 files changed, 8 insertions(+), 6 deletions(-) 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 027333db1..1a27eeb3d 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 @@ -5854,6 +5854,8 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService { boolean bool = orderSplitRecordService.compareOrderSplitRecord(generatedOrderSplitRecordList, queryOrderSplitRecordList); if (!bool) { logger.info("校验或更新订单分账信息-订单:{}, 分账记录不一致, 保存分账记录", orderCode); + // 删除历史的分账记录 + orderSplitRecordService.deleteOrderSplitRecord(orderCode); // 保存orderSplitRecords到数据库 orderSplitRecordService.batchInsert(generatedOrderSplitRecordList); } else { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java index 154a1d93b..c23ea5e26 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java @@ -268,7 +268,7 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { return resultList; } // 根据merchantId查询汇付账户信息 - AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); + // AdapayMemberAccount adapayMemberAccount = adapayMemberAccountService.selectByMerchantId(merchantId); List usedAdapayMemberIdList = adapayMemberAccountService.selectUsedAdapayMemberIdByMerchantId(merchantId); // 按天分组, 组装结果集 key 为 tradeDate, value 为该天的订单分账记录 Map> dailyRecordMap = orderSplitRecords.stream().collect(Collectors.groupingBy(OrderSplitRecord::getTradeDate)); diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java index 2187e7bfe..3aecc833e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/SettleOrderReportServiceImpl.java @@ -437,11 +437,11 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService { } // 从清分账单中计算交易金额，交易手续费 - GetClearingBillDTO clearingBillDTO = GetClearingBillDTO.builder() - .merchantId(dto.getMerchantId()) - .startTime(dto.getStartTime()) - .endTime(dto.getEndTime()) - .build(); + // GetClearingBillDTO clearingBillDTO = GetClearingBillDTO.builder() + // .merchantId(dto.getMerchantId()) + // .startTime(dto.getStartTime()) + // .endTime(dto.getEndTime()) + // .build(); PageHelper.clearPage(); BigDecimal tradeAmount = BigDecimal.ZERO;