From f232dd614c8f2ad162acb4d21f15b7345b35aef6 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Wed, 13 Mar 2024 14:35:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E8=BD=BD=E8=AE=A1=E7=AE=97=E7=AB=99?=
 =?UTF-8?q?=E7=82=B9=E8=AE=A2=E5=8D=95=E6=8A=A5=E8=A1=A8=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/SettleOrderReportService.java     | 11 ++++++-
 .../impl/SettleOrderReportServiceImpl.java    | 31 ++++++++++++++-----
 .../com/jsowell/quartz/task/JsowellTask.java  |  1 +
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/SettleOrderReportService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/SettleOrderReportService.java
index ffb2b14b7..09729e179 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/SettleOrderReportService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/SettleOrderReportService.java
@@ -6,6 +6,7 @@ import com.jsowell.pile.dto.GetClearingBillDTO;
 import com.jsowell.pile.dto.MerchantOrderReportDTO;
 import com.jsowell.pile.dto.SettleOrderReportDTO;
 import com.jsowell.pile.vo.web.MerchantOrderReportVO;
+import com.jsowell.pile.vo.web.PileStationVO;
 
 import java.util.List;
 import java.util.Map;
@@ -111,6 +112,15 @@ public interface SettleOrderReportService {
      * @param tradeDate 交易日期
      */
     void generateDailyOrderReports(String stationId, String tradeDate);
+
+    /**
+     * 计算站点订单报表
+     *
+     * @param stationInfo 站点信息
+     * @param tradeDate 交易日期
+     */
+    void generateDailyOrderReports(PileStationVO stationInfo, String tradeDate);
+
     Map<String, Object> queryUndividedOrder(SettleOrderReportDTO dto);
 
     /**
@@ -120,5 +130,4 @@ public interface SettleOrderReportService {
      */
     public PageResponse getMerchantClearingBillList(GetClearingBillDTO dto);
 
-
 }
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 b95cd4fd0..1cfdf69d2 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
@@ -40,10 +40,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -571,6 +568,28 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
             tradeDate = LocalDate.now().plusDays(-1).toString();
         }
         PileStationVO stationInfo = pileStationInfoService.getStationInfo(stationId);
+
+        // 方法重载
+        generateDailyOrderReports(stationInfo, tradeDate);
+    }
+
+    /**
+     * 计算站点订单报表
+     *
+     * @param stationInfo 站点信息
+     * @param tradeDate 交易日期
+     */
+    @Override
+    public void generateDailyOrderReports(PileStationVO stationInfo, String tradeDate) {
+        // logger.info("线程名===={}", Thread.currentThread().getName());
+        if (Objects.isNull(stationInfo)) {
+            return;
+        }
+        if (StringUtils.isBlank(tradeDate)) {
+            // 日期为空默认昨天
+            tradeDate = LocalDate.now().plusDays(-1).toString();
+        }
+        String stationId = stationInfo.getId();
         // 查询站点前一天结算完成的订单
         QueryOrderDTO dto = new QueryOrderDTO();
         dto.setStationId(stationId);
@@ -583,10 +602,6 @@ public class SettleOrderReportServiceImpl implements SettleOrderReportService {
         dto.setMerchantId(stationInfo.getMerchantId());
         // 查询结算完成的订单
         List<OrderListVO> orderListVOS = orderBasicInfoMapper.selectOrderBasicInfoList(dto);
-        // if (CollectionUtils.isEmpty(orderListVOS)) {
-        //     logger.info("站点:{}, 在{}-{}没有查询到订单数据", stationInfo.getStationName(), startTime, endTime);
-        //     return;
-        // }
         List<String> collect = orderListVOS.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList());
         log.info("站点:{}, 在{}-{}查询到订单数据{}条，订单编号:{}", stationInfo.getStationName(), startTime, endTime, orderListVOS.size(), collect);
         // 统计出日报信息
diff --git a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java
index 58cd2810f..6510569e7 100644
--- a/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java
+++ b/jsowell-quartz/src/main/java/com/jsowell/quartz/task/JsowellTask.java
@@ -126,6 +126,7 @@ public class JsowellTask {
 		// 查询出所有站点
 		PileStationInfo pileStationInfo = new PileStationInfo();
 		pileStationInfo.setDelFlag(Constants.ZERO);
+		// 查询未删除的站点列表
 		List<PileStationInfo> list = pileStationInfoService.selectPileStationInfoList(pileStationInfo);
 		if (CollectionUtils.isEmpty(list)) {
 			return;