Merge branch 'developer' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into developer

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/hm/HmQrcodeApiServiceImpl.java

@@ -400,6 +400,11 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
                 hmQrcodeQDTO.setStoreName(storeDTO.getStoreName());
             }
         }
+        HmQrcodeBO hmQrcodeBO = hmQrcodeService.queryByClerkId(clerkId, wxEnterpriseId);
+        if (hmQrcodeBO != null) {
+            logger.error("已经生成过活码,clerkId：{}",clerkId);
+            return null;
+        }
         StaffClerkRelationDTO staffClerkRelationDTO = staffClerkRelationService.getByClerkId(clerkId);
         if (staffClerkRelationDTO != null) {
             hmQrcodeQDTO.setStaffId(staffClerkRelationDTO.getStaffId());
@@ -424,6 +429,11 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
         List<HmClerkRelationQDTO> clerkRelationQDTOS = new ArrayList<>();
         Date now = new Date();
         for (String clerkId : clerkIdList) {
+            HmClerkRelationBO hmClerkRelationBO = hmClerkRelationService.queryByHmIdAndClerkId(hmId, clerkId);
+            if (hmClerkRelationBO != null) {
+                logger.error("该导购已经在该多人活码中,clerkId:{}",clerkId);
+                continue;
+            }
             StaffClerkRelationDTO clerkRelationDTO = staffClerkRelationService.getByClerkId(clerkId);
             HmClerkRelationQDTO hmClerkRelationQDTO = new HmClerkRelationQDTO();
             hmClerkRelationQDTO.setRelationId(UniqueIdUtils.uniqueLong());