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

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffClerkRelationDTO.java

@@ -150,7 +150,7 @@ public class StaffClerkRelationDTO implements Serializable {
 
     public Integer getOpenConcatFlag() {
         if(null == openConcatFlag) {
-            return 0 ;
+            return 1 ;
         }
         return openConcatFlag;
     }

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffClerkRelationServiceImpl.java

@@ -133,6 +133,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         Date now = new Date();
         dto.setStaffClerkRelationId(ToolUtil.randomUUID());
         dto.setStatusFlag(1);
+        dto.setOpenConcatFlag(1);
         dto.setCreateTime(now);
         dto.setUpdateTime(now);
         int insert = mapper.insert(EntityUtil.changeEntityByJSON(TabHaobanStaffClerkRelation.class, dto));
@@ -189,6 +190,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         staffClerkRelation.setCreateTime(new Date());
         staffClerkRelation.setUpdateTime(new Date());
         staffClerkRelation.setStatusFlag(1);
+        staffClerkRelation.setOpenConcatFlag(1);
         TabHaobanStaffClerkRelation relation = EntityUtil.changeEntityByJSON(TabHaobanStaffClerkRelation.class, staffClerkRelation);
         mapper.insert(relation);
         return uuid;

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

@@ -665,6 +665,7 @@ public class HmQrcodeApiServiceImpl implements HmQrcodeApiService {
                     logger.info("导购无活码，无需处理：clerkId：{}", clerkId);
                     continue;
                 }
+                staffClerkRelationService.updateOpenConcatFlagById(0, relationDTO.getStaffClerkRelationId());
                 hmQrcodeService.updateStatusById(hmQrcodeBO.getHmId(), 3);
             }
         }