no message

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

@@ -247,11 +247,11 @@ public class OrderBaseLogic {
                 .stream()
                 .map(OrderBaseVO::getId)
                 .collect(Collectors.toList());
-        final List<AdminWebsit> adminWebsits = new ArrayList<>();
+        List<AdminWebsit> adminWebsits = new ArrayList<>();
         Map<String, String> adminWebsitMap = new HashMap<>();
 
         if (CollectionUtil.isNotEmpty(orderBaseVOS)) {
-            adminWebsitService.lambdaQuery()
+            adminWebsits = adminWebsitService.lambdaQuery()
                     .eq(AdminWebsit::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId())
                     .in(AdminWebsit::getWebsitId, orderBaseVOS.stream().map(OrderBaseVO::getWebsitId).collect(Collectors.toList()))
                     .list();
@@ -276,7 +276,7 @@ public class OrderBaseLogic {
             final String attr = adminWebsitMap.get(orderBaseVO.getWebsitId());
             if (StringUtils.isNotBlank(attr)
                     && attr.equals(WebsitAttrEnum.SELF.getKey())
-                    && "安装, 拆移机".contains(orderBaseVO.getOrderSmallType())) {
+                    && "安装, 拆移机".contains(orderBaseVO.getOrderSmallTypeText())) {
                 orderBaseVO.setNeedSlave(true);
             }
         }
@@ -375,8 +375,8 @@ public class OrderBaseLogic {
 
         final AdminWebsit adminWebsit = adminWebsitService.getById(pgOrderBase.getWebsitId());
         if (Objects.nonNull(adminWebsit)) {
-            if (pgOrderBase.getOrderSmallType().equals(WebsitAttrEnum.SELF.getKey())
-                    && "安装, 拆移机".contains(pgOrderBase.getOrderSmallType())) {
+            if (adminWebsit.getAttr().equals(WebsitAttrEnum.SELF.getKey())
+                    && "安装, 拆移机".contains(pgOrderBase.getOrderSmallTypeText())) {
                 pgOrderBaseDetailVO.setNeedSlave(true);
             }
         }
@@ -436,7 +436,7 @@ public class OrderBaseLogic {
         final AdminWebsit adminWebsit = adminWebsitService.getById(pgOrderBase.getWebsitId());
 
         if (adminWebsit.getAttr().equals(WebsitAttrEnum.SELF.getKey())
-                && "安装, 拆移机".contains(pgOrderBase.getOrderSmallType())
+                && "安装, 拆移机".contains(pgOrderBase.getOrderSmallTypeText())
                 && CollectionUtil.isEmpty(workerList)) {
             throw new RemoteServiceException("工单的类型必须至少选一个小工");
         }
@@ -523,7 +523,7 @@ public class OrderBaseLogic {
         final AdminWebsit adminWebsit = adminWebsitService.getById(pgOrderBase.getWebsitId());
         StringBuilder joinSlaveStr = new StringBuilder();
         if (adminWebsit.getAttr().equals(WebsitAttrEnum.SELF.getKey())
-                && "安装, 拆移机".contains(pgOrderBase.getOrderSmallType())) {
+                && "安装, 拆移机".contains(pgOrderBase.getOrderSmallTypeText())) {
             final List<WorkerTeamBean> teamBeanList = this.slaveWorkerTeam(orderBaseId, pgOrderBase);
             if (CollectionUtil.isEmpty(teamBeanList)) {
                 throw new RemoteServiceException("工单类型必须有一组有效的组队，抢单失败");