Merge remote-tracking branch 'origin/康年堂' into 康年堂

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreAfterSalesScrmServiceImpl.java

@@ -992,37 +992,32 @@ public class FsStoreAfterSalesScrmServiceImpl implements IFsStoreAfterSalesScrmS
         storeAfterSalesStatus.setChangeTime(Timestamp.valueOf(LocalDateTime.now()));
         storeAfterSalesStatus.setOperator(param.getOperator());
         afterSalesStatusService.insertFsStoreAfterSalesStatus(storeAfterSalesStatus);
-
-        if(ObjectUtil.equal(order.getStatus(),2) && CloudHostUtils.hasCloudHostName("康年堂")){
-            throw new CustomException("无法撤销");
-        }
-
         // 如果已发货走发货售后逻辑，否则直接取消
-        if(ObjectUtil.equal(order.getStatus(),2)){
-            FsJstAftersalePush fsJstAftersalePush = new FsJstAftersalePush();
-            fsJstAftersalePush.setOrderId(order.getOrderCode());
-            fsJstAftersalePush.setTaskStatus(TaskStatusEnum.PENDING.getCode());
-            fsJstAftersalePush.setType(String.valueOf(AfterSalesOrderStatusEnum.CLOSED.getIndex()));
-            fsJstAftersalePush.setRetryCount(0);
-            fsJstAftersalePush.setAfterSaleId(String.valueOf(storeAfterSales.getId()));
-            fsJstAftersalePushMapper.insert(fsJstAftersalePush);
-        } else {
-            //创建新的OMS订单
-            if (storeAfterSales.getOrderStatus().equals(OrderInfoEnum.STATUS_1.getValue()) ) {
-                if(StringUtils.isNotEmpty(order.getExtendOrderId())){
-                    //更新订单code
-                    String orderSn = IdUtil.getSnowflake(0, 0).nextIdStr();
-                    FsStoreOrderScrm orderMap=new FsStoreOrderScrm();
-                    orderMap.setId(order.getId());
-                    orderMap.setOrderCode(orderSn);
-                    orderService.updateFsStoreOrder(orderMap);
-                    storeAfterSales.setOrderCode(orderSn);
-                    orderItemService.updateFsStoreOrderCode(order.getId(),orderSn);
-                    //生成新的订单
-                    orderService.createOmsOrder(order.getId());
-                }
-            }
-        }
+//        if(ObjectUtil.equal(order.getStatus(),2)){
+//            FsJstAftersalePush fsJstAftersalePush = new FsJstAftersalePush();
+//            fsJstAftersalePush.setOrderId(order.getOrderCode());
+//            fsJstAftersalePush.setTaskStatus(TaskStatusEnum.PENDING.getCode());
+//            fsJstAftersalePush.setType(String.valueOf(AfterSalesOrderStatusEnum.CLOSED.getIndex()));
+//            fsJstAftersalePush.setRetryCount(0);
+//            fsJstAftersalePush.setAfterSaleId(String.valueOf(storeAfterSales.getId()));
+//            fsJstAftersalePushMapper.insert(fsJstAftersalePush);
+//        } else {
+//            //创建新的OMS订单
+//            if (storeAfterSales.getOrderStatus().equals(OrderInfoEnum.STATUS_1.getValue()) ) {
+//                if(StringUtils.isNotEmpty(order.getExtendOrderId())){
+//                    //更新订单code
+//                    String orderSn = IdUtil.getSnowflake(0, 0).nextIdStr();
+//                    FsStoreOrderScrm orderMap=new FsStoreOrderScrm();
+//                    orderMap.setId(order.getId());
+//                    orderMap.setOrderCode(orderSn);
+//                    orderService.updateFsStoreOrder(orderMap);
+//                    storeAfterSales.setOrderCode(orderSn);
+//                    orderItemService.updateFsStoreOrderCode(order.getId(),orderSn);
+//                    //生成新的订单
+//                    orderService.createOmsOrder(order.getId());
+//                }
+//            }
+//        }
 
 
         fsStoreAfterSalesMapper.updateFsStoreAfterSales(storeAfterSales);