bugfix:574定时任务修改

585订单查询修改

alien-job/src/main/java/shop/alien/job/store/LifeUserOrderJob.java

@@ -58,7 +58,7 @@ public class LifeUserOrderJob {
         //1.查询待支付超时订单
         List<LifeUserOrder> lifeUserOrders = lifeUserOrderMapper.selectList(new LambdaQueryWrapper<LifeUserOrder>()
                 .eq(LifeUserOrder::getStatus, OrderStatusEnum.WAIT_PAY.getStatus())
-                .le(LifeUserOrder::getBuyTime, LocalDateTime.now().minusMinutes(15)));
+                .le(LifeUserOrder::getBuyTime, LocalDateTime.now().minusMinutes(30)));
         if (CollectionUtils.isEmpty(lifeUserOrders)) {
             return "无待支付超时订单";
         }

alien-store/src/main/java/shop/alien/store/service/LifeUserOrderService.java

@@ -836,10 +836,21 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
 
         // 提取SQL基础部分，避免重复定义
         String baseSql = "select DISTINCT ocm1.order_id from order_coupon_middle ocm1 where 1=1";
-
+        // TODO 应该可以直接判断总表
         if (!"-1".equals(orderStatus)) {
             // 非-1状态：直接添加状态条件
-            String sql = baseSql + " and ocm1.status = " + orderStatus;
+                String sql = baseSql + " and ocm1.status = " + orderStatus;
+            if("2".equals(orderStatus)){
+                // 已完成进行特殊处理,
+                sql = sql + " and ocm1.order_id not in (\n" +
+                        "\tselect\n" +
+                        "\tDISTINCT ocm2.order_id\n" +
+                        "from\n" +
+                        "\torder_coupon_middle ocm2\n" +
+                        "where\n" +
+                        "\t ocm2.status = 1\n" +
+                        "\t)";
+            }
             lifeUserOrderQueryWrapper.inSql("luo.id", sql);
         } else {
             // -1状态且storeId不为空时添加条件