首冲判断

lhb-basic/lhb-basic-biz/src/main/java/com/kxs/lhb/basic/biz/service/impl/LhbOrderServiceImpl.java

@@ -428,7 +428,7 @@ public class LhbOrderServiceImpl extends MPJBaseServiceImpl<LhbOrderMapper, LhbO
             //更新状态
             if("41".equals(outStatus) || "2".equals(outStatus)){
                 //41-配送中，不可取消订单 2-订单成功结束
-                sendToOrder(order, "41".equals(outStatus) ? NotifyStatusEnum.DISTRIBUTION : NotifyStatusEnum.FINISH);
+                sendToOrder(order, "41".equals(outStatus) ? NotifyStatusEnum.DISTRIBUTION : NotifyStatusEnum.ACT);
             }
             if("3".equals(outStatus)){
                 //3-订单异常取消
@@ -447,6 +447,7 @@ public class LhbOrderServiceImpl extends MPJBaseServiceImpl<LhbOrderMapper, LhbO
     @Async
     public void orderFirstCharge() {
         List<LhbOrder> orders = list(Wrappers.lambdaQuery(LhbOrder.class)
+                .eq(LhbOrder::getOutStatus, 2)
                 .eq(LhbOrder::getIsAct, CommonConstants.FAIL)
                 .eq(LhbOrder::getStatus, OrderStatusEnum.PAY.getCode()));
 
@@ -467,12 +468,11 @@ public class LhbOrderServiceImpl extends MPJBaseServiceImpl<LhbOrderMapper, LhbO
                 order.setFirstCharge(firstChargeAmt);
                 order.setIsAct(CommonConstants.SUCCESS);
                 sendToOrder(order, NotifyStatusEnum.ACT);
-            }else if("未首充".equals(firstCharge)){
+            }
+            //订单超过30天自动设置为已激活
+            if(order.getCreateTime().plusDays(30).isBefore(LocalDateTime.now())){
                 update(Wrappers.lambdaUpdate(LhbOrder.class).eq(LhbOrder::getId, order.getId())
                         .set(LhbOrder::getIsAct, CommonConstants.SUCCESS));
-                order.setIsAct(CommonConstants.SUCCESS);
-                order.setFirstCharge(BigDecimal.ZERO);
-                sendToOrder(order, NotifyStatusEnum.ACT);
             }
 
         });