Merge remote-tracking branch 'origin/dev_v1_1_20220720' into dev_v1_1_20220720

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -421,7 +421,11 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
                                        if (timeOutOrder.getStatus() == 0) {
                                            payingOrderHandle(timeOutOrder);
                                        } else if (timeOutOrder.getStatus() == 6) {
-                                           cancelOrder(timeOutOrder.getId(), "超时取消", null);
+                                           try {
+                                               cancelOrder(timeOutOrder.getId(), "超时取消", null);
+                                           } catch (Exception e) {
+                                               LOG.warn("订单取消失败,{}",e.fillInStackTrace());
+                                           }
                                        }
                                    }, 60L, TimeUnit.SECONDS);
 
@@ -791,7 +795,12 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             DistributedLock.of(redissonClient)
                            .runIfLockCanGet(OrderCacheEnum.LOCK_ORDER_NO_MALL.getRedisKey(omsOrder.getOrderSn())
                                    , () -> {
-                                       this.confirmReceiveOrder(omsOrder.getId());
+                                        try {
+                                            this.confirmReceiveOrder(omsOrder.getId());
+
+                                        }catch (Exception e) {
+                                            LOG.warn("订单收货，{}",e.fillInStackTrace());
+                                        }
                                    }, 60L, TimeUnit.SECONDS);
         }
         return omsOrders.size();
@@ -818,7 +827,12 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
             DistributedLock.of(redissonClient)
                            .runIfLockCanGet(OrderCacheEnum.LOCK_ORDER_NO_MALL.getRedisKey(omsOrder.getOrderSn())
                                    , () -> {
-                                       this.FinishReceiveOrder(omsOrder.getId());
+                               try {
+                                   this.FinishReceiveOrder(omsOrder.getId());
+
+                               } catch (Exception e) {
+                                   LOG.warn("停止售后失败，{}",e.fillInStackTrace());
+                               }
                                    }, 60L, TimeUnit.SECONDS);
         }
         return omsOrders.size();