需求

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseLogic.java

@@ -848,7 +848,8 @@ public class OrderBaseLogic {
         if(pgOrderBase == null){
             throw new RemoteServiceException("工单不存在");
         }
-        if(!OrderBaseStatusEnum.YQX.getKey().equals(pgOrderBase.getOrderStatus())){
+        if(!(OrderBaseStatusEnum.YQX.getKey().equals(pgOrderBase.getOrderStatus()) || OrderBaseStatusEnum.FWQX.getKey().equals(pgOrderBase.getOrderStatus())
+        || OrderBaseStatusEnum.YCGB.getKey().equals(pgOrderBase.getOrderStatus()))){
             throw new RemoteServiceException("非已取消工单不可激活");
         }
         OrderBaseStatusEnum orderBaseStatus = OrderBaseStatusEnum.DSHPG;