Merge branch 'ferture/四月迭代需求' into 'master'

test

See merge request !1207

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

@@ -158,7 +158,6 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         String storeId = clerkRelation.getStoreId() ;
         boolean needFlush = false ;
         boolean delFlag = true ;
-        boolean newClerkIdFlag = StringUtils.isNotEmpty(newClerkId) ;
         if(StringUtils.isEmpty(newClerkId)) {
             // 成员关联的门店
             List<StaffClerkRelationDTO> relationList = this.listByStaffId(wxEnterpriseId, staffId) ;
@@ -207,11 +206,7 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         if(delFlag) {
             this.mapper.changeStatusByClerkId(oldClerkId, 0);
         }
-        if(newClerkIdFlag) {
-            logger.info("换门店后,查询主门店,newClerkId={}",newClerkId);
-            // 设置主门店
-            this.clerkMainStoreRelatedService.getMainStoreByStaffId(staffId, wxEnterpriseId, null) ;
-        }
+       
         if(StringUtils.isNotBlank(newClerkId)) {
             List<String> memberIdList = this.externalClerkRelatedMapper.listByClerkId(staffId, oldClerkId) ;
             this.externalClerkRelatedService.updateClerkInfo(staffId , oldClerkId , newClerkId) ;

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

@@ -561,6 +561,9 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
             logger.info("绑定结果正常：{}，{}", JSONObject.toJSONString(response), oldRelationDTO.getClerkId());
             if (response == null) {
                 this.staffClerkRelationService.insert(oldRelationDTO);
+                logger.info("换门店后,查询主门店,newClerkId={}",oldRelationDTO.getStaffId());
+                // 设置主门店
+                this.clerkMainStoreRelatedService.getMainStoreByStaffId(oldRelationDTO.getStaffId(), oldRelationDTO.getWxEnterpriseId(), null) ;
             }
         /*} else {
             String oldClerkId = oldRelationDTO.getClerkId();