no message

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

@@ -494,7 +494,8 @@ public class OrderBaseLogic {
 
 
         if ("安装, 拆移机".contains(pgOrderBase.getOrderSmallTypeText())) {
-            if (StringUtils.isBlank(one.getWorkerNumber())) {
+            if (adminWebsit.getAttr().equals(WebsitAttrEnum.SELF.getKey())
+                    && StringUtils.isBlank(one.getWorkerNumber())) {
                 throw new RemoteServiceException("没有S编号暂无权限接单");
             }
 

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

@@ -9,6 +9,7 @@ import com.gree.mall.manager.bean.workorder.*;
 import com.gree.mall.manager.commonmapper.workorder.IncreMapper;
 import com.gree.mall.manager.constant.SysDictConstant;
 import com.gree.mall.manager.enums.PayStatusEnum;
+import com.gree.mall.manager.enums.WebsitAttrEnum;
 import com.gree.mall.manager.enums.admin.AdminWebsitTypeEnum;
 import com.gree.mall.manager.enums.workorder.OrderBaseStatusEnum;
 import com.gree.mall.manager.enums.workorder.OrderOperatorLogTypeEnum;
@@ -26,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
-import org.thymeleaf.util.StringUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -187,6 +188,7 @@ public class ChangeOrderLogic {
                 .set(PgOrderBase::getOrderStatusText,OrderBaseStatusEnum.DJD.getRemark())
                 .set(PgOrderBase::getWorkerIdcard,userOne.getIdCard())
                 .set(PgOrderBase::getWorkerId,userOne.getUserId())
+                .set(PgOrderBase::getWorkerNumber,userOne.getWorkerNumber())
                 .set(PgOrderBase::getWorkerMobile,userOne.getMobile())
                 .set(PgOrderBase::getDispatchTime,new Date())
                 .set(PgOrderBase::getIsQd,false)
@@ -202,6 +204,12 @@ public class ChangeOrderLogic {
                 pgOrderBase1.setIsMeet(false);
                 pgOrderBase1.updateById();
             }
+            if ("安装, 拆移机".contains(pgOrderBase.getOrderSmallTypeText())
+                    && adminWebsit.getAttr().equals(WebsitAttrEnum.SELF.getKey())
+                    && StringUtils.isBlank(pgOrderBase.getWorkerNumber())) {
+
+                throw new RemoteServiceException("没有S编号师傅, 无法派单");
+            }
         }