From 61590a6d18d0ecbb35a0f6da4bb7f0293c1ca412 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Mon, 29 Sep 2025 14:33:58 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=8F=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=86=E8=B4=A6=E8=AE=B0=E5=BD=95=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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 936fb5b82..9ba93c49b 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 @@ -33,6 +33,7 @@ import com.jsowell.pile.service.OrderSplitRecordService; import com.jsowell.pile.service.PileMerchantInfoService; import com.jsowell.pile.vo.OrderInfoDetailVO; import com.jsowell.pile.vo.web.*; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -42,6 +43,7 @@ import java.math.BigDecimal; import java.util.*; import java.util.stream.Collectors; +@Slf4j @Service public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { @@ -159,6 +161,7 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { } // 根据入参拉出时间段内所有订单的分账记录 List orderSplitRecords = orderSplitRecordMapper.queryOrderSplitDataList(merchantId, stationId, startTime, endTime); + log.info("根据入参拉出时间段内所有订单的分账记录, 订单数量:{}", orderSplitRecords.size()); // orderSplitRecords中电费分账金额与服务费分账金额为null, 设置0 for (OrderSplitRecord orderSplitRecord : orderSplitRecords) { if (orderSplitRecord.getElectricitySplitAmount() == null) { From 4043933276110292536fc6997ab8b009148220b6 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Mon, 29 Sep 2025 14:39:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=8F=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=86=E8=B4=A6=E8=AE=B0=E5=BD=95=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/pile/service/impl/OrderSplitRecordServiceImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 9ba93c49b..f95557e2a 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 @@ -161,7 +161,8 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { } // 根据入参拉出时间段内所有订单的分账记录 List orderSplitRecords = orderSplitRecordMapper.queryOrderSplitDataList(merchantId, stationId, startTime, endTime); - log.info("根据入参拉出时间段内所有订单的分账记录, 订单数量:{}", orderSplitRecords.size()); + log.info("根据入参拉出时间段内所有订单的分账记录, merchantId:{}, stationId:{}, startTime:{}, endTime:{}", + merchantId, stationId, startTime, endTime); // orderSplitRecords中电费分账金额与服务费分账金额为null, 设置0 for (OrderSplitRecord orderSplitRecord : orderSplitRecords) { if (orderSplitRecord.getElectricitySplitAmount() == null) { From 786dbcf43123137172411014170c086c24e90ab5 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Mon, 29 Sep 2025 14:45:14 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=91=E9=A2=9D=E5=8F=96=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=86=E8=B4=A6=E8=AE=B0=E5=BD=95=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/pile/service/impl/SettleOrderReportServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 62e2854e1..1eac02b16 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 @@ -686,7 +686,7 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService { log.info("站点:{}, 在{}-{}查询到订单数据{}条，订单编号:{}", stationInfo.getStationName(), startTime, endTime, orderListVOS.size(), collect); // 根据入参拉出时间段内所有订单的分账记录 - List orderSplitRecords = orderSplitRecordService.queryOrderSplitRecordList(stationInfo.getMerchantId(), stationId, startTime, endTime); + List orderSplitRecords = orderSplitRecordService.queryOrderSplitRecordList(stationInfo.getMerchantId(), stationId, tradeDate, tradeDate); log.info("查分账记录，站点:{}, 在{}-{}查询到分账数据{}条", stationInfo.getStationName(), startTime, endTime, orderSplitRecords.size()); // orderSplitRecords转为map, key为订单编号, value为分账记录 Map splitRecordMap = orderSplitRecords.stream().collect(Collectors.toMap(OrderSplitRecord::getOrderCode, v -> v));