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

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

@@ -12,10 +12,7 @@ import com.gree.mall.miniapp.bean.order.WorkerTeamBean;
 import com.gree.mall.miniapp.bean.user.CurrentCompanyWechat;
 import com.gree.mall.miniapp.bean.workorder.*;
 import com.gree.mall.miniapp.commonmapper.workorder.OrderBaseCMapper;
-import com.gree.mall.miniapp.enums.ExamineStatusEnum;
-import com.gree.mall.miniapp.enums.StateEnum;
-import com.gree.mall.miniapp.enums.UserTypeEnum;
-import com.gree.mall.miniapp.enums.WebsitAttrEnum;
+import com.gree.mall.miniapp.enums.*;
 import com.gree.mall.miniapp.enums.workorder.AppraiseStatusEnum;
 import com.gree.mall.miniapp.enums.workorder.OrderBaseStatusEnum;
 import com.gree.mall.miniapp.enums.workorder.OrderFlagEnum;
@@ -620,16 +617,16 @@ public class OrderBaseLogic {
      * @return
      */
     public List<WorkerTeamBean> slaveWorkerTeam(String orderBaseId, PgOrderBase orderBase) {
-        String workerNumber;
+        String workerId;
         if (Objects.isNull(orderBase)) {
             orderBase = pgOrderBaseService.getById(orderBaseId);
             if (StringUtils.equals(orderBase.getOrderStatus(), OrderBaseStatusEnum.YWG.getKey())) {
                 throw new RemoteServiceException("工单状态”已完工“");
             }
-            workerNumber = orderBase.getWorkerNumber();
+            workerId = orderBase.getWorkerId();
         } else {
             CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat();
-            workerNumber = currentCompanyWechat.getUser().getWorkerNumber();
+            workerId = currentCompanyWechat.getUser().getUserId();
         }
         Map<String, WorkerTeamBean> workerTeamMap = new HashMap<>();
         if (StringUtils.isNotBlank(orderBase.getWorkerId())) {
@@ -655,9 +652,9 @@ public class OrderBaseLogic {
 
         final List<WorkerTeam> teamList = workerTeamService.lambdaQuery()
                 .eq(WorkerTeam::getCompanyWechatId, orderBase.getCompanyWechatId())
-                .and(v -> v.eq(WorkerTeam::getMasterWorkerId, workerNumber)
+                .and(v -> v.eq(WorkerTeam::getMasterWorkerId, workerId)
                         .or()
-                        .eq(WorkerTeam::getAssistantWorkerId, workerNumber))
+                        .eq(WorkerTeam::getAssistantWorkerId, workerId))
                 .eq(WorkerTeam::getStatus, StateEnum.ON.getKey())
                 .orderByAsc(WorkerTeam::getCreateTime)
                 .list();
@@ -666,10 +663,10 @@ public class OrderBaseLogic {
             List<WorkerTeamBean> allTeamList = new ArrayList<>();
             for (WorkerTeam workerTeam : teamList) {
                 WorkerTeamBean bean = new WorkerTeamBean();
-                if (workerTeam.getMasterWorkerId().equals(workerNumber)) {
-                    bean.setWorkerNumber(workerTeam.getAssistantWorkerId());
+                if (workerTeam.getMasterWorkerId().equals(workerId)) {
+                    bean.setWorkerId(workerTeam.getAssistantWorkerId());
                 } else {
-                    bean.setWorkerNumber(workerTeam.getMasterWorkerId());
+                    bean.setWorkerId(workerTeam.getMasterWorkerId());
                 }
 
                 bean.setIsSelect(false);
@@ -682,15 +679,15 @@ public class OrderBaseLogic {
             }
 
             final List<User> userList = userService.lambdaQuery()
-                    .in(User::getWorkerNumber, allTeamList.stream()
-                            .map(WorkerTeamBean::getWorkerNumber)
+                    .in(User::getUserId, allTeamList.stream()
+                            .map(WorkerTeamBean::getWorkerId)
                             .collect(Collectors.toList()))
                     .eq(User::getType, UserTypeEnum.WORKER.getKey())
                     .list();
-            final Map<String, User> userMap = userList.stream().collect(Collectors.toMap(User::getWorkerNumber, Function.identity()));
+            final Map<String, User> userMap = userList.stream().collect(Collectors.toMap(User::getUserId, Function.identity()));
 
             for (WorkerTeamBean workerTeam : allTeamList) {
-                final User user = userMap.get(workerTeam.getWorkerNumber());
+                final User user = userMap.get(workerTeam.getWorkerId());
                 if (Objects.nonNull(user)) {
                     WorkerTeamBean bean = new WorkerTeamBean();
                     bean.setWorkerId(user.getUserId());
@@ -698,7 +695,7 @@ public class OrderBaseLogic {
                     bean.setWorkerNumber(user.getWorkerNumber());
                     bean.setWorkerMobile(user.getMobile());
                     bean.setWorkerIdCard(user.getIdCard());
-                    bean.setIsSelect(bean.getIsSelect());
+                    bean.setIsSelect(workerTeam.getIsSelect());
                     workerTeamMap.put(user.getUserId(), bean);
                     index++;
                 }
@@ -709,7 +706,7 @@ public class OrderBaseLogic {
             // 清除非正常状态的小工师傅
             final List<WebsitUser> websitUserList = websitUserService.lambdaQuery()
                     .eq(WebsitUser::getCompanyWechatId, orderBase.getCompanyWechatId())
-                    .ne(WebsitUser::getExamineStatus, ExamineStatusEnum.OK.getKey())
+                    .notIn(WebsitUser::getExamineStatus, ExamineWorkerStatusEnum.OK.getKey(), ExamineWorkerStatusEnum.EXPIRED.getKey())
                     .eq(WebsitUser::getWebsitId, orderBase.getWebsitId())
                     .in(WebsitUser::getUserId, workerTeamMap.keySet())
                     .list();

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -830,6 +830,9 @@ public class AdminWebsitLogic {
             final WebsitAttrEnum websitAttrEnum = BaseEnum.valueToEnumDefault(WebsitAttrEnum.class, attrName, WebsitAttrEnum.SELF);
             String insurePayConfigId = null;
             if (websitAttrEnum.getKey().equals(WebsitAttrEnum.SELF.getKey())) {
+                if (Objects.isNull(row.get(13)) || org.apache.commons.lang3.StringUtils.isBlank(row.get(13).toString())) {
+                    throw new RemoteServiceException("第" + rowIndex + "行, 保险支付商户号不能为空");
+                }
                 String insurePayName = row.get(13).toString().trim();
                 final AdminCompanyWechatPayConfig insurePayConfig = adminCompanyWechatPayConfigService.lambdaQuery()
                         .eq(AdminCompanyWechatPayConfig::getPayMerchantName, insurePayName)