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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/workorder/OrderBaseLogic.java

@@ -435,15 +435,15 @@ public class OrderBaseLogic {
         final AdminWebsit adminWebsit = adminWebsitService.getById(pgOrderBase.getWebsitId());
 
 
-        if ("安装, 拆移机".contains(pgOrderBase.getOrderSmallTypeText())
-                && StringUtils.isBlank(one.getWorkerNumber())) {
-            throw new RemoteServiceException("暂无权限接单");
-        }
+        if ("安装, 拆移机".contains(pgOrderBase.getOrderSmallTypeText())) {
+            if (StringUtils.isBlank(one.getWorkerNumber())) {
+                throw new RemoteServiceException("暂无权限接单");
+            }
 
-        if (adminWebsit.getAttr().equals(WebsitAttrEnum.SELF.getKey())
-                && "安装, 拆移机".contains(pgOrderBase.getOrderSmallTypeText())
-                && CollectionUtil.isEmpty(workerList)) {
-            throw new RemoteServiceException("工单的类型必须至少选一个小工");
+            if (adminWebsit.getAttr().equals(WebsitAttrEnum.SELF.getKey())
+                    && CollectionUtil.isEmpty(workerList)) {
+                throw new RemoteServiceException("工单的类型必须至少选一个小工");
+            }
         }
 
         StringBuilder joinSlaveStr = new StringBuilder();

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

@@ -873,13 +873,13 @@ public class OrderBaseLogic {
         OrderBaseStatusEnum orderBaseStatus = OrderBaseStatusEnum.DSHPG;
         if (StringUtils.isNotBlank(pgOrderBase.getWebsitId())) {
             orderBaseStatus = OrderBaseStatusEnum.DWDPG;
-            if (pgOrderBase != null && pgOrderBase.getIsQd()) {
-                orderBaseStatus = OrderBaseStatusEnum.DQD;
-            }
-        }
-        if (StringUtils.isNotBlank(pgOrderBase.getWorkerId())) {
-            orderBaseStatus = OrderBaseStatusEnum.FWZ;
+//            if (pgOrderBase != null && pgOrderBase.getIsQd()) {
+//                orderBaseStatus = OrderBaseStatusEnum.DQD;
+//            }
         }
+//        if (StringUtils.isNotBlank(pgOrderBase.getWorkerId())) {
+//            orderBaseStatus = OrderBaseStatusEnum.FWZ;
+//        }
         pgOrderBase.setOrderStatus(orderBaseStatus.getKey());
         pgOrderBase.setOrderStatusText(orderBaseStatus.getRemark());
         pgOrderBase.updateById();