From 3340ed122e19e3943ce4f93eb52103b623a3fc2c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 27 四月 2022 15:43:58 +0800
Subject: [PATCH] 订单消息bug修改

---
 fanli/src/main/java/com/yeshi/fanli/job/order/vipshop/UpdateVipShopOrderJob.java |   60 ++++++++++++++++++++++++++++++------------------------------
 1 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/job/order/vipshop/UpdateVipShopOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/order/vipshop/UpdateVipShopOrderJob.java
index 5230708..91dfb50 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/order/vipshop/UpdateVipShopOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/order/vipshop/UpdateVipShopOrderJob.java
@@ -1,12 +1,12 @@
 package com.yeshi.fanli.job.order.vipshop;
 
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 import javax.annotation.Resource;
 
 import com.yeshi.fanli.dao.mybatis.vipshop.VipShopOrderMapper;
+import com.yeshi.fanli.entity.order.CommonOrder;
+import com.yeshi.fanli.service.inter.order.CommonOrderService;
 import com.yeshi.fanli.util.Constant;
 import com.yeshi.fanli.util.vipshop.DingDanXiaApiUtil;
 import org.springframework.stereotype.Component;
@@ -97,15 +97,18 @@
     //鏍规嵁璁㈠崟鍙锋洿鏂�
     @XxlJob("order-vip-updateByOrderSn")
     public ReturnT<String> updateByOrderSn(String param) throws Exception {
-        List<VipShopOrder> orders = vipShopOrderService.listByOrderSn(param);
-        if (orders == null || orders.size() == 0)
-            throw new Exception("璁㈠崟涓嶅瓨鍦�");
-
-        VipShopOrder vipShopOrder = DingDanXiaApiUtil.getOrderDetail(param);
-        if (vipShopOrder != null) {
-            List<VipShopOrder> vipShopOrderList = new ArrayList<>();
-            vipShopOrderList.add(vipShopOrder);
-            saveVipShopOrders(vipShopOrderList);
+        String[] ps = param.split(",");
+        for (String p : ps) {
+            List<VipShopOrder> orders = vipShopOrderService.listByOrderSn(p);
+            if (orders == null || orders.size() == 0)
+                throw new Exception("璁㈠崟涓嶅瓨鍦�");
+            Thread.sleep(1000);
+            VipShopOrder vipShopOrder = DingDanXiaApiUtil.getOrderDetail(p);
+            if (vipShopOrder != null) {
+                List<VipShopOrder> vipShopOrderList = new ArrayList<>();
+                vipShopOrderList.add(vipShopOrder);
+                saveVipShopOrders(vipShopOrderList);
+            }
         }
         return ReturnT.SUCCESS;
     }
@@ -118,27 +121,24 @@
      * @return
      * @throws Exception
      */
+    @Resource
+    private CommonOrderService commonOrderService;
+
     @XxlJob("order-vip-updateByLongTimeNoUpdate")
     public ReturnT<String> updateByLongTimeNoUpdate(String param) throws Exception {
-        Date maxCreateTime = new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * 30);
-        Date minCreateTime = new Date(maxCreateTime.getTime() - 1000 * 60 * 60 * 24L * 60L);
-        VipShopOrderMapper.DaoQuery daoQuery = new VipShopOrderMapper.DaoQuery();
-        daoQuery.orderSubStatusName = "宸蹭粯娆�";
-        daoQuery.minCreateTime = minCreateTime;
-        daoQuery.maxCreateTime = maxCreateTime;
-        long count = vipShopOrderMapper.count(daoQuery);
-        if (count > 0) {
-            daoQuery.start = 0;
-            daoQuery.count = (int) count;
-            List<VipShopOrder> orderList = vipShopOrderMapper.list(daoQuery);
-            for (VipShopOrder order : orderList) {
-                try {
-                    updateByOrderSn(order.getOrderSn());
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
+
+        List<CommonOrder> commonOrders = commonOrderService.listPayStateOrder(Constant.SOURCE_TYPE_VIP, null, new Date(System.currentTimeMillis() - 1000 * 60 * 60 * 24L * 10));
+        if (commonOrders == null || commonOrders.size() == 0) {
+            throw new Exception("娌℃湁闇�瑕佹洿鏂扮殑璁㈠崟");
         }
+        Set<String> orderIds = new HashSet<>();
+        for (CommonOrder commonOrder : commonOrders) {
+            orderIds.add(commonOrder.getOrderNo());
+        }
+        for (String orderId : orderIds) {
+            updateByOrderSn(orderId);
+        }
+
         return ReturnT.SUCCESS;
     }
 

--
Gitblit v1.8.0