需求

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

@@ -879,16 +879,11 @@ public class OrderBaseLogic {
         if(pgOrderBase == null){
             throw new RemoteServiceException("工单不存在");
         }
-        if(!StringUtils.equals(pgOrderBase.getOrderStatus(),OrderBaseStatusEnum.YWG.getKey())){
-            throw new RemoteServiceException("非已完工待结算状态不可驳回");
-        }
-        if(!StringUtils.equals(pgOrderBase.getOrderStatus(),OrderBaseStatusEnum.GCSZX.getKey())){
-            throw new RemoteServiceException("非已完工待结算状态不可驳回");
-        }
-        if(!StringUtils.equals(pgOrderBase.getOrderStatus(),OrderBaseStatusEnum.WDWG.getKey())){
-            throw new RemoteServiceException("非已完工待结算状态不可驳回");
-        }
-        if(!StringUtils.equals(pgOrderBase.getOrderStatus(),OrderBaseStatusEnum.YWGO.getKey())){
+        if(!StringUtils.equals(pgOrderBase.getOrderStatus(),OrderBaseStatusEnum.YWG.getKey())
+         && !StringUtils.equals(pgOrderBase.getOrderStatus(),OrderBaseStatusEnum.GCSZX.getKey())
+         && !StringUtils.equals(pgOrderBase.getOrderStatus(),OrderBaseStatusEnum.WDWG.getKey())
+         && !StringUtils.equals(pgOrderBase.getOrderStatus(),OrderBaseStatusEnum.YWGO.getKey())
+        ){
             throw new RemoteServiceException("非已完工待结算状态不可驳回");
         }
         pgOrderBase.setOrderStatus(OrderBaseStatusEnum.FWZ.getKey());