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

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/worker/WorkerTeamLogic.java

@@ -155,6 +155,22 @@ public class WorkerTeamLogic {
             throw new RemoteServiceException("申请发起人不能”确认“记录");
         }
         if (status.getKey().equals(ExamineStatusEnum.OK.getKey())) {
+            apply.setStatus(status.getKey())
+                    .updateById();
+            final Integer count = workerTeamService.lambdaQuery()
+                    .eq(WorkerTeam::getWebsitId, apply.getWebsitId())
+                    .eq(WorkerTeam::getMasterWorkerId, apply.getMasterWorkerId())
+                    .eq(WorkerTeam::getAssistantWorkerId, apply.getAssistantWorkerId())
+                    .count();
+            final Integer count1 = workerTeamService.lambdaQuery()
+                    .eq(WorkerTeam::getWebsitId, apply.getWebsitId())
+                    .eq(WorkerTeam::getMasterWorkerId, apply.getAssistantWorkerId())
+                    .eq(WorkerTeam::getAssistantWorkerId, apply.getMasterWorkerId())
+                    .count();
+
+            if (count > 0 || count1 > 0) {
+                return;
+            }
             new WorkerTeam()
                     .setCompanyWechatId(apply.getCompanyWechatId())
                     .setCompanyWechatName(apply.getCompanyWechatName())

mall-server-api/src/main/java/com/gree/mall/manager/logic/worker/WorkerTeamLogic.java

@@ -115,6 +115,7 @@ public class WorkerTeamLogic {
 
         final Integer count2 = workerTeamApplyService.lambdaQuery()
                 .eq(WorkerTeamApply::getCompanyWechatId, workerTeam.getCompanyWechatId())
+                .eq(WorkerTeamApply::getWebsitId, workerTeam.getWebsitId())
                 .eq(WorkerTeamApply::getStatus, ExamineStatusEnum.WAIT.getKey())
                 .eq(WorkerTeamApply::getMasterWorkerId, workerTeam.getMasterWorkerId())
                 .eq(WorkerTeamApply::getAssistantWorkerId, workerTeam.getAssistantWorkerId())
@@ -125,6 +126,7 @@ public class WorkerTeamLogic {
 
         final Integer count3 = workerTeamApplyService.lambdaQuery()
                 .eq(WorkerTeamApply::getCompanyWechatId, workerTeam.getCompanyWechatId())
+                .eq(WorkerTeamApply::getWebsitId, workerTeam.getWebsitId())
                 .eq(WorkerTeamApply::getStatus, ExamineStatusEnum.WAIT.getKey())
                 .eq(WorkerTeamApply::getMasterWorkerId, workerTeam.getAssistantWorkerId())
                 .eq(WorkerTeamApply::getAssistantWorkerId, workerTeam.getMasterWorkerId())