Merge branch 'feature-0808' into developer

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffClerkRelationApiService.java

 package com.gic.haoban.manage.api.service;
 
-import java.util.List;
-import java.util.Set;
-
 import com.gic.api.base.commons.Page;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
@@ -10,6 +7,9 @@ import com.gic.haoban.manage.api.dto.StaffClerkBindLogDetailDTO;
 import com.gic.haoban.manage.api.dto.StaffClerkInfoDTO;
 import com.gic.haoban.manage.api.dto.StaffClerkRelationDTO;
 
+import java.util.List;
+import java.util.Set;
+
 public interface StaffClerkRelationApiService {
     /**
      * 绑定日志
@@ -39,7 +39,12 @@ public interface StaffClerkRelationApiService {
 
     StaffClerkRelationDTO getByCodeAndEnterpriseId(String clerkCode, String enterpriseId);
 
-
+    /**
+     * 审核绑定
+     * @param staffClerkRelation
+     * @param optStaffId
+     * @param chanelCode
+     */
     void delAndInsert(StaffClerkRelationDTO staffClerkRelation, String optStaffId, int chanelCode);
 
     /**

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

@@ -295,10 +295,7 @@ public class StaffClerkRelationApiServiceImpl implements StaffClerkRelationApiSe
             staffClerkBindLogService.pushToMq(oldStaffClerkRelation.getStaffId(), optStaffId, BindTypeEnum.UNBIND.getVal(), chanelCode, staffClerkRelation.getStaffClerkRelationId());
             clerkMainStoreRelatedService.delMainStore(oldStaffClerkRelation.getStaffId(), oldStaffClerkRelation.getStoreId(), oldStaffClerkRelation.getWxEnterpriseId());
         }
-        String relationId = staffClerkRelationService.insert(staffClerkRelation);
-        staffClerkBindLogService.pushToMq(staffClerkRelation.getStaffId(), optStaffId, BindTypeEnum.BIND.getVal(), chanelCode, relationId);
-        //设置主门店
-        clerkMainStoreRelatedService.getMainStoreByStaffId(staffClerkRelation.getStaffId(), staffClerkRelation.getWxEnterpriseId());
+        staffClerkRelationService.bind(staffClerkRelation,optStaffId,chanelCode);
     }
 
     @Override

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

@@ -7,9 +7,7 @@ import com.gic.clerk.api.service.ClerkService;
 import com.gic.commons.util.EntityUtil;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.api.dto.StaffDepartmentRelatedDTO;
-import com.gic.haoban.manage.api.dto.qdto.hm.HmQrcodeQDTO;
 import com.gic.haoban.manage.api.enums.AppPageType;
-import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 import com.gic.haoban.manage.api.enums.NoticeMessageTypeEnum;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.StaffDepartmentRelatedApiService;
@@ -525,20 +523,6 @@ public class StaffDepartmentRelatedApiServiceImpl implements StaffDepartmentRela
             NoticeMessageUtil.sendNoticeMessageByStaff(enterpriseId, staffId, clerkId, NoticeMessageTypeEnum.STORE_ACCOUNT_REFUSE.getType(), auditId, params, jsonObject);
         } else {
             NoticeMessageUtil.sendNoticeMessageByStaff(enterpriseId, staffId, clerkId, NoticeMessageTypeEnum.STORE_ACCOUNT_AGREE.getType(), auditId, params, jsonObject);
-            StaffDTO staffDTO = staffApiService.selectById(staffId);
-            logger.info("绑定自动创建活码,staffId:{}",staffId);
-            // 绑定自动创建活码
-            HmQrcodeQDTO hmQrcodeQDTO = new HmQrcodeQDTO();
-            hmQrcodeQDTO.setHmType(1);
-            hmQrcodeQDTO.setWxEnterpriseId(staffDTO.getWxEnterpriseId());
-            hmQrcodeQDTO.setEnterpriseId(enterpriseId);
-            hmQrcodeQDTO.setName(staffDTO.getStaffName());
-            hmQrcodeQDTO.setPassFlag(1);
-            hmQrcodeQDTO.setStoreId(clerkDTO.getStoreId());
-            hmQrcodeQDTO.setClerkIdList(Collections.singletonList(clerkDTO.getClerkId()));
-            hmQrcodeQDTO.setInvokingType(ChannelCodeEnum.AUDIT_BIND.getCode());
-            hmQrcodeApiService.add(hmQrcodeQDTO);
-
         }
 
     }