From ac62831a53293659cb02a9a4d7bada9b8f522601 Mon Sep 17 00:00:00 2001
From: Lemon <ziao4956@gmail.com>
Date: Tue, 17 Dec 2024 10:21:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E5=AE=81=E6=B3=A2?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=89=B9=E9=87=8F=E8=A1=A5=E6=8E=A8=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jsowell/pile/mapper/OrderBasicInfoMapper.java    | 3 +++
 .../com/jsowell/pile/service/OrderBasicInfoService.java  | 7 +++++++
 .../pile/service/impl/OrderBasicInfoServiceImpl.java     | 5 +++++
 .../main/resources/mapper/pile/OrderBasicInfoMapper.xml  | 9 +++++++++
 .../service/impl/ZhongDianLianPlatformServiceImpl.java   | 9 +++++----
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
index f14c18d07..f093b9ac8 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderBasicInfoMapper.java
@@ -391,4 +391,7 @@ public interface OrderBasicInfoMapper {
     List<BusinessOrderDetailInfoVO> getOrderDetailByStationIds(@Param("stationIds") List<String> stationIds, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     List<OrderBasicInfo> queryOrdersByPileConnectorCodeAndStatus(@Param("pileConnectorCode") String pileConnectorCode, @Param("orderStatus") String orderStatus, @Param("payStatus") String payStatus);
+
+
+    List<String> tempGetOrderCodes(QueryOrderDTO dto);
 }
\ No newline at end of file
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
index e28d59e18..5d73cee5d 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/OrderBasicInfoService.java
@@ -499,4 +499,11 @@ public interface OrderBasicInfoService{
      * @param orderCode
      */
     List<BusinessOrderBillingInfoVO> getOrderBillingDetail(String orderCode);
+
+    /**
+     * 临时接口，根据站点id、订单创建时间区间查询订单编号
+     * @param dto
+     * @return
+     */
+    List<String> tempGetOrderCodes(QueryOrderDTO dto);
 }
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 20c1b30c8..e85174648 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
@@ -4192,5 +4192,10 @@ public class OrderBasicInfoServiceImpl implements OrderBasicInfoService {
         }
         return resultList;
     }
+
+    @Override
+    public List<String> tempGetOrderCodes(QueryOrderDTO dto) {
+        return orderBasicInfoMapper.tempGetOrderCodes(dto);
+    }
 }
 
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index 2ee887b49..fce21a633 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -3071,4 +3071,13 @@
     limit 20
   </select>
 
+  <select id="tempGetOrderCodes" resultType="java.lang.String">
+    select
+      order_code
+    from
+      order_basic_info
+    where
+      station_id = #{stationId,jdbcType=VARCHAR}
+    and create_time between #{startTime,jdbcType=VARCHAR} and #{endTime,jdbcType=VARCHAR}
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ZhongDianLianPlatformServiceImpl.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ZhongDianLianPlatformServiceImpl.java
index b70fcd075..88e870ed1 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ZhongDianLianPlatformServiceImpl.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/platform/service/impl/ZhongDianLianPlatformServiceImpl.java
@@ -974,12 +974,13 @@ public class ZhongDianLianPlatformServiceImpl implements ThirdPartyPlatformServi
         ThirdPartySecretInfoVO ningBoSecretInfoVO = getNingBoSecretInfoVO();
 
         // 根据站点id， 开始时间，结束时间查询出所有的订单信息
-        List<OrderListVO> orderListVOS = orderBasicInfoService.selectOrderBasicInfoList(dto);
-        if (CollectionUtils.isEmpty(orderListVOS)) {
+        // List<OrderListVO> orderListVOS = orderBasicInfoService.selectOrderBasicInfoList(dto);
+        List<String> orderCodes = orderBasicInfoService.tempGetOrderCodes(dto);
+        if (CollectionUtils.isEmpty(orderCodes)) {
             return "订单信息为空";
         }
-        List<String> orderCodeList = orderListVOS.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList());
-        for (String orderCode : orderCodeList) {
+        // List<String> orderCodeList = orderListVOS.stream().map(OrderListVO::getOrderCode).collect(Collectors.toList());
+        for (String orderCode : orderCodes) {
             try {
                 String result = notificationChargeOrderInfo(orderCode, ningBoSecretInfoVO);
                 logger.info("订单:{} 推送结果:{}", orderCode, result);