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 0be6a26c2..02d2d7dc0 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,8 @@ public class OrderSplitRecordServiceImpl implements OrderSplitRecordService { } // 根据入参拉出时间段内所有订单的分账记录 List orderSplitRecords = orderSplitRecordMapper.queryOrderSplitDataList(merchantId, stationId, startTime, endTime); + log.info("根据入参拉出时间段内所有订单的分账记录, merchantId:{}, stationId:{}, startTime:{}, endTime:{}", + merchantId, stationId, startTime, endTime); // orderSplitRecords中电费分账金额与服务费分账金额为null, 设置0 for (OrderSplitRecord orderSplitRecord : orderSplitRecords) { if (orderSplitRecord.getElectricitySplitAmount() == null) { 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 e46118222..74a117827 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 @@ -680,7 +680,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));