From 85908b4c7038bf58d00a7123333f02d4ac46bb56 Mon Sep 17 00:00:00 2001
From: "autumn.g@foxmail.com" <autumn.g@foxmail.com>
Date: Wed, 26 Jul 2023 18:05:54 +0800
Subject: [PATCH] update

---
 .../pile/mapper/OrderBasicInfoMapper.java     |  7 ++++
 .../impl/OrderBasicInfoServiceImpl.java       | 35 +++++++++++++++++--
 .../mapper/pile/OrderBasicInfoMapper.xml      | 13 +++++--
 3 files changed, 51 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 3fc755fdf..237752026 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
@@ -218,4 +218,11 @@ public interface OrderBasicInfoMapper {
 	List<MerchantOrderInfoVO> getMerchantOrderInfoList(@Param("dto") QueryMerchantOrderDTO dto);
 
     List<RefundOrder> batchRefundQuery(List<String> orderCodeList);
+
+	/**
+	 * 根据订单编号
+	 * @param orderCodeList 订单编号列表
+	 * @return
+	 */
+	List<OrderBasicInfo> queryOrderList(@Param("orderCodeList") List<String> orderCodeList);
 }
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 d3aefbbfe..d7bb4f54b 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
@@ -883,8 +883,26 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
         }
 
         // 根据交易日期查询运营商下面所有站点的交易日报
-        List<SettleOrderReport> orderReports = settleOrderReportService.selectByMerchantIdAndDate(merchantId, tradeDate);
-
+        List<SettleOrderReport> stationReportList = settleOrderReportService.selectByMerchantIdAndDate(merchantId, tradeDate);
+        for (SettleOrderReport orderReport : stationReportList) {
+            String orderCodes = orderReport.getOrderCodes();
+            if (StringUtils.isBlank(orderCodes)) {
+                logger.warn("站点:{}, 日期:{}, 没有查到订单数据", orderReport.getStationId(), tradeDate);
+                continue;
+            }
+            List<String> orderCodeList = Lists.newArrayList(StringUtils.split(orderCodes, ","));
+            List<OrderBasicInfo> orderBasicInfos = queryOrderList(orderCodeList);
+            if (CollectionUtils.isEmpty(orderBasicInfos)) {
+                continue;
+            }
+            orderBasicInfos.parallelStream().forEach(x -> {
+                try {
+                    doPaymentConfirm(x, adapayMemberAccount);
+                } catch (Exception e) {
+                    logger.error("订单交易确认失败:{}", x.getOrderCode(), e);
+                }
+            });
+        }
     }
 
     /**
@@ -944,6 +962,19 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
         }
     }
 
+    /**
+     * 批量查询订单
+     * @param orderCodeList
+     * @return
+     */
+    public List<OrderBasicInfo> queryOrderList(List<String> orderCodeList) {
+        List<OrderBasicInfo> resultList = Lists.newArrayList();
+        if (CollectionUtils.isEmpty(orderCodeList)) {
+            return resultList;
+        }
+        return orderBasicInfoMapper.queryOrderList(orderCodeList);
+    }
+
     /**
      * 临时订单退款
      */
diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
index c07afcd49..8d4757998 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml
@@ -1082,8 +1082,6 @@
         <if test="dto.endTime != null" >
             and t1.settlement_time <![CDATA[ <= ]]> #{dto.endTime,jdbcType=VARCHAR}
         </if>
-
-
         order by t1.create_time desc
     </select>
 
@@ -1105,4 +1103,15 @@
             #{itme,jdbcType=VARCHAR}
         </foreach>
     </select>
+
+    <select id="queryOrderList" resultMap="OrderBasicInfoResult">
+        select
+            <include refid="Base_Column_List"/>
+        from order_basic_info
+        where del_flag = '0'
+        and order_code in
+        <foreach collection="orderCodeList" item="item" open="(" separator="," close=")">
+            #{item,jdbcType=VARCHAR}
+        </foreach>
+    </select>
 </mapper>
\ No newline at end of file