绑定接口

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/enums/ChannelCodeEnum.java

@@ -13,6 +13,7 @@ public enum ChannelCodeEnum {
     SYNC_UNBIND(2003,"GIC同步解绑"),
     WEIXIN_DEL(2004,"微信删除解绑"),
     AUDIT_UNBIND(2005,"审核解绑"),
+//    CHANGR_RIGHT_UNBIND(2005,"审核解绑"),
     ;
     private int code;
     private String name;

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

@@ -42,10 +42,11 @@ public interface WxEnterpriseRelatedApiService {
 	 *
 	 * @param enterpriseId
 	 * @param wxEnterpriseId
-	 * @param staffId
+	 * @param optStaffId
+	 * @param channalCode
 	 * @return
 	 */
-	public boolean flushBindStoreByEnterpriseId(String enterpriseId, String wxEnterpriseId, String staffId);
+	public boolean flushBindStoreByEnterpriseId(String enterpriseId, String wxEnterpriseId, String optStaffId, int channalCode);
 
 	/**
 	 * 获取企业绑定详情

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanStaffClerkRelationMapper.java

@@ -89,4 +89,15 @@ public interface TabHaobanStaffClerkRelationMapper {
 	List<TabHaobanStaffClerkRelation> pageByWxEnterpriseId(@Param("wxEnterpriseId")String wxEnterpriseId);
 
     List<TabHaobanStaffClerkRelation> listBindByStoreId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("storeId") String storeId);
+
+    /**
+     * 授权绑定的列表
+     *
+     * @param wxEnterpriseId
+     * @param storeIds
+     * @return
+     */
+    List<TabHaobanStaffClerkRelation> listBindByStoreIds(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("storeIds") Set<String> storeIds);
+
+    void delByStoreIds(@Param("storeIds") Set<String> storeIds);
 }
\ No newline at end of file

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/TabHaobanStoreRelationMapper.java

@@ -22,6 +22,10 @@ public interface TabHaobanStoreRelationMapper {
 
     /**
      */
+    int insertBatch(@Param("list") List<TabStoreRelation> list);
+
+    /**
+     */
     TabStoreRelation selectByPrimaryKey(String storeRelationId);
 
     /**
@@ -42,6 +46,20 @@ public interface TabHaobanStoreRelationMapper {
     public int deleteStoreRalation(@Param("enterpriseId") String enterpriseId, @Param("storeId") String storeId);
 
     /**
+     * 门店搜索
      */
     List<TabStoreRelation> searchStoreRange(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("enterpriseId") String enterpriseId, @Param("search") String search);
+
+    /**
+     * 门店搜索
+     */
+    List<TabStoreRelation> listStoreRange(@Param("enterpriseId") String enterpriseId);
+
+    /**
+     * 删除门店
+     *
+     * @param enterpriseId
+     * @return
+     */
+    public int deleteAllStoreRalation(@Param("enterpriseId") String enterpriseId);
 }
\ No newline at end of file

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

@@ -30,6 +30,16 @@ public interface StaffClerkBindLogService {
     public void pushToMq(String staffId,String optStaffId,int optType,int channelCode,String relationId);
 
     /**
+     * 插入日志到mq
+     *
+     * @param optStaffId
+     * @param optType
+     * @param channelCode
+     * @param relationIds
+     */
+    public void pushToMqBatch(String optStaffId, int optType, int channelCode, List<String> relationIds);
+
+    /**
      *
      * @return
      */

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

@@ -26,6 +26,15 @@ public interface StaffClerkRelationService {
 	public boolean delBind(String clerkId,String optStaffId,int chanelCode);
 
 	/**
+	 * 删除绑定
+	 *
+	 * @param wxEnterpriseId 可以不传
+	 * @param storeIds
+	 * @return
+	 */
+	public boolean delBindByStoreIds(String wxEnterpriseId, Set<String> storeIds, String optStaffId, int chanelCode);
+
+	/**
 	 * 绑定
 	 * @param dto
 	 * @return

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

@@ -76,7 +76,7 @@ public interface StoreRangeService {
      * @param list
      * @return
      */
-    public boolean saveStoreRelations(List<TabStoreRelation> list);
+    public boolean saveStoreRelations(List<TabStoreRelation> list, String optStaffId, int channelCode);
 
 
 }

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

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Created 2020/6/24.
@@ -62,6 +63,28 @@ public class StaffClerkBindLogServiceImpl implements StaffClerkBindLogService {
     }
 
     @Override
+    public void pushToMqBatch(String optStaffId, int optType, int channelCode, List<String> relationIds) {
+        logger.info("pushToMqBatch: {},{}", optStaffId, channelCode);
+        List<String> ret = relationIds.stream().map(rid -> {
+            StaffClerkBindLogInfoDTO infoDTO = new StaffClerkBindLogInfoDTO();
+            infoDTO.setChannelCode(channelCode);
+            infoDTO.setOptStaffId(optStaffId);
+            infoDTO.setOptType(optType);
+            infoDTO.setRelationId(rid);
+            return JSONObject.toJSONString(infoDTO);
+        }).collect(Collectors.toList());
+
+        GicMQClient clientInstance = GICMQClientUtil.getClientInstance();
+        try {
+            logger.info("绑定的mq日志：{},{}", optStaffId, relationIds);
+            clientInstance.sendBatchMessages(STAFF_LOG_MQ, ret);
+        } catch (Exception e) {
+            e.printStackTrace();
+
+        }
+    }
+
+    @Override
     public Page<StaffClerkBindLogDetailDTO> pageBindLog(String wxEnterpriseId,List<String> clerkIds, List<String> staffIds, List<String> enterpriseIds, int optType,String search, BasePageInfo pageInfo) {
         PageHelper.startPage(pageInfo);
         List<TabHaobanStaffClerkBindLog> clerkBindLogList = staffClerkBindLogMapper.listStaffClerkBindLog(wxEnterpriseId, clerkIds, staffIds, enterpriseIds, optType,search);

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

 package com.gic.haoban.manage.service.service.impl;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSONObject;
 import com.gic.commons.util.ToolUtil;
@@ -93,6 +94,21 @@ public class StaffClerkRelationServiceImpl implements StaffClerkRelationService
         return b;
     }
 
+    @Override
+    public boolean delBindByStoreIds(String wxEnterpriseId, Set<String> storeIds, String optStaffId, int chanelCode) {
+        List<TabHaobanStaffClerkRelation> needUnbind = mapper.listBindByStoreIds(wxEnterpriseId, storeIds);
+        needUnbind.forEach(tab -> {
+            tab.setStatusFlag(0);
+        });
+        //清除绑定
+        mapper.delByStoreIds(storeIds);
+
+        List<String> need = needUnbind.stream().map(tab -> tab.getStaffClerkRelationId()).collect(Collectors.toList());
+        //放入队列
+        staffClerkBindLogService.pushToMqBatch(optStaffId, BindTypeEnum.UNBIND.getVal(), chanelCode, need);
+        return true;
+    }
+
     private void delSetMainStore(TabHaobanStaffClerkRelation staffClerkRelation) {
         if (staffClerkRelation == null) {
             logger.info("staffClerkRelation为空");

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

@@ -5,21 +5,26 @@ import com.gic.commons.util.ToolUtil;
 import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.manage.api.dto.StoreOrGroupInfoDTO;
+import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanStoreRangeMapper;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanStoreRelationMapper;
 import com.gic.haoban.manage.service.entity.TabStoreRange;
 import com.gic.haoban.manage.service.entity.TabStoreRelation;
+import com.gic.haoban.manage.service.service.StaffClerkRelationService;
 import com.gic.haoban.manage.service.service.StoreRangeService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.google.common.collect.Sets;
 import org.apache.commons.collections.CollectionUtils;
+import org.slf4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import static org.slf4j.LoggerFactory.getLogger;
+
 /**
  * Created 2021/4/9.
  *
@@ -28,12 +33,17 @@ import java.util.stream.Collectors;
 @Service
 public class StoreRangeServiceImpl implements StoreRangeService {
 
+    private static final Logger logger = getLogger(StoreRangeServiceImpl.class);
+
     @Autowired
     private TabHaobanStoreRangeMapper tabHaobanStoreRangeMapper;
 
     @Autowired
     private TabHaobanStoreRelationMapper tabHaobanStoreRelationMapper;
 
+    @Autowired
+    private StaffClerkRelationService staffClerkRelationService;
+
 
     @Override
     public boolean saveStoreRange(List<StoreOrGroupInfoDTO> relations, String enterpriseId, String wxEnterpriseId) {
@@ -95,11 +105,33 @@ public class StoreRangeServiceImpl implements StoreRangeService {
     }
 
     @Override
-    public boolean saveStoreRelations(List<TabStoreRelation> list) {
-        //todo 销售线索 批量操作
-        list.forEach(tab -> {
-            tabHaobanStoreRelationMapper.insertSelective(tab);
+    public boolean saveStoreRelations(List<TabStoreRelation> list, String optStaffId, int channelCode) {
+        if (CollectionUtils.isEmpty(list)) {
+            logger.info("没有需要保存的");
+            return true;
+        }
+        String enterpriseId = list.get(0).getEnterpriseId();
+        //根据wxEnterpriseId 分组
+        Map<String, Set<String>> newStoreIdBywxEnterpriseMap = list.stream().collect(Collectors.groupingBy(TabStoreRelation::getWxEnterpriseId, Collectors.mapping(dto -> dto.getStoreId(), Collectors.toSet())));
+
+        List<TabStoreRelation> storeRelations = tabHaobanStoreRelationMapper.listStoreRange(enterpriseId);
+        Map<String, Set<String>> oldStoreIdBywxEnterpriseMap = storeRelations.stream().collect(Collectors.groupingBy(TabStoreRelation::getWxEnterpriseId, Collectors.mapping(dto -> dto.getStoreId(), Collectors.toSet())));
+
+        Set<String> needUnBindStoreIds = new HashSet<>();
+        oldStoreIdBywxEnterpriseMap.forEach((wxEid, oldStoreIds) -> {
+            Set<String> newStoreIds = newStoreIdBywxEnterpriseMap.get(wxEid);
+            if (CollectionUtils.isEmpty(newStoreIds)) {
+                return;
+            }
+            Sets.SetView<String> needDelStoreIds = Sets.difference(oldStoreIds, newStoreIds);
+            Set<String> mid = needDelStoreIds.stream().collect(Collectors.toSet());
+            needUnBindStoreIds.addAll(mid);
         });
+        //todo 这些门店解除绑定
+//        staffClerkRelationService.delBindByStoreIds(null,needUnBindStoreIds,optStaffId, channelCode);
+        //先删除 后新增
+        tabHaobanStoreRelationMapper.deleteAllStoreRalation(enterpriseId);
+        tabHaobanStoreRelationMapper.insertBatch(list);
         return true;
     }
 }

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

@@ -210,8 +210,8 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 	}
 
 	@Override
-	public boolean flushBindStoreByEnterpriseId(String enterpriseId, String wxEnterpriseId, String staffId) {
-		logger.info("刷新绑定门店：eid:{},staffid:{}", enterpriseId, staffId);
+	public boolean flushBindStoreByEnterpriseId(String enterpriseId, String wxEnterpriseId, String optStaffId, int channalCode) {
+		logger.info("刷新绑定门店：eid:{},staffid:{}", enterpriseId, optStaffId);
 		List<TabStoreRange> groupInfoDTOS = storeRangeService.queryAllBindRangeByEnterpriseId(enterpriseId);
 		if (CollectionUtils.isEmpty(groupInfoDTOS)) {
 			logger.info("无需刷新：{}", enterpriseId);
@@ -235,7 +235,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 		//获取所有门店分组
 		List<PowerStoreGroupDTO> storeGroupList = storeGroupService.getStoreGroupList(enterpriseId, null);
 		Map<String, Set<String>> storeGroupChainMap = storeGroupList.stream().collect(Collectors.toMap(dto -> dto.getStoreGroupId(),
-				dto -> Arrays.stream(dto.getStoreGroupChain().split("-")).filter(str -> StringUtils.isNotBlank(str)).collect(Collectors.toSet())));
+				dto -> Arrays.stream(dto.getStoreGroupChain().split("_")).filter(str -> StringUtils.isNotBlank(str)).collect(Collectors.toSet())));
 
 		//获取集团门店的分组 然后根据分组来查询门店
 		storeGroupChainMap.forEach((groupId, chainGroupIds) -> {
@@ -265,6 +265,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
                         TabStoreRelation tabStoreRelation = new TabStoreRelation();
 						tabStoreRelation.setWxEnterpriseId(wxEid);
                         tabStoreRelation.setStoreGroupId(simpleDTO.getStoreGroupId());
+						tabStoreRelation.setStoreId(simpleDTO.getStoreId());
 						tabStoreRelation.setStatusFlag(1);
                         tabStoreRelation.setStoreName(simpleDTO.getStoreName());
                         tabStoreRelation.setEnterpriseId(simpleDTO.getEnterpriseId());
@@ -276,7 +277,7 @@ public class WxEnterpriseRelatedApiServiceImpl implements WxEnterpriseRelatedApi
 			ret.addAll(midRelations);
 		});
 
-		storeRangeService.saveStoreRelations(ret);
+		storeRangeService.saveStoreRelations(ret, optStaffId, channalCode);
 		return false;
 	}
 

haoban-manage3-service/src/main/resources/mapper/TabHaobanStaffClerkRelationMapper.xml

@@ -383,4 +383,30 @@
     and store_id=#{storeId}
     and status_flag =1
   </select>
+
+  <select id="listBindByStoreIds" resultMap="BaseResultMap">
+    select
+    <include refid="Base_Column_List"/>
+    from tab_haoban_staff_clerk_relation
+    where store_id in
+    <foreach collection="storeIds" item="item" separator="," open="(" close=")">
+      #{item}
+    </foreach>
+    <if test="wxEnterpriseId!=null">
+      and wx_enterprise_id = #{wxEnterpriseId,jdbcType=VARCHAR}
+    </if>
+    and status_flag =1
+  </select>
+  <update id="delByStoreIds">
+    UPDATE
+    tab_haoban_staff_clerk_relation
+    SET
+    status_flag=0,
+    update_time=now()
+    where store_id in
+    <foreach collection="storeIds" item="item" separator="," open="(" close=")">
+      #{item}
+    </foreach>
+    and status_flag =1
+  </update>
 </mapper>
\ No newline at end of file

haoban-manage3-service/src/main/resources/mapper/TabHaobanStoreRelationMapper.xml

@@ -90,6 +90,21 @@
             </if>
         </trim>
     </insert>
+
+    <insert id="insertBatch">
+        insert into tab_haoban_store_relation (store_relation_id, wx_enterprise_id,
+        store_id,store_name, store_group_id, enterprise_id,
+        status_flag, create_time, update_time
+        )
+        values
+        <foreach collection="list" separator="," item="item">
+            (#{item.storeRelationId,jdbcType=VARCHAR}, #{item.wxEnterpriseId,jdbcType=VARCHAR},
+            #{item.storeId,jdbcType=VARCHAR},#{item.storeName,jdbcType=VARCHAR}, #{item.storeGroupId,jdbcType=VARCHAR},
+            #{item.enterpriseId,jdbcType=VARCHAR},
+            1, now(), now()
+            )
+        </foreach>
+    </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.gic.haoban.manage.service.entity.TabStoreRelation">
         update tab_haoban_store_relation
         <set>
@@ -148,4 +163,21 @@
         and store_name like concat("%",#{search},"%")
         and status_flag=1
     </select>
+
+    <select id="listStoreRange" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List"/>
+        from tab_haoban_store_relation
+        where enterprise_id = #{enterpriseId,jdbcType=VARCHAR}
+        and status_flag=1
+    </select>
+
+    <update id="deleteAllStoreRalation">
+        update tab_haoban_store_relation
+        set
+        status_flag = 0,
+        update_time = now()
+        where enterprise_id=#{enterpriseId}
+        and status_flag=1
+    </update>
 </mapper>
\ No newline at end of file

haoban-manage3-service/src/test/java/ServiceTest.java

@@ -3,6 +3,7 @@ import com.gic.api.base.commons.JSONResponse;
 import com.gic.commons.util.GICMQClientUtil;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
+import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.TestApiService;
@@ -67,12 +68,14 @@ public class ServiceTest {
     private MemberUnionRelatedService memberUnionRelatedService;
 
 
+
     private final ExecutorService pools = Executors.newFixedThreadPool(50);
 
     @Test
     public void test11() {
-        List<WxEnterpriseDTO> wxEnterpriseDTOS = wxEnterpriseRelatedApiService.listWxEnterpriseByEid("ff8080815dacd3a2015dacd3ef5c0000");
-        System.out.println(1);
+        boolean b = wxEnterpriseRelatedApiService.flushBindStoreByEnterpriseId("ff8080815dacd3a2015dacd3ef5c0000"
+                , "ca66a01b79474c40b3e7c7f93daf1a3b", "-1", ChannelCodeEnum.SYNC_UNBIND.getCode());
+        System.out.println(b);
     }
 
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseController.java

@@ -15,6 +15,7 @@ import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.common.utils.EntityUtil;
 import com.gic.haoban.common.utils.HaobanResponse;
 import com.gic.haoban.manage.api.dto.*;
+import com.gic.haoban.manage.api.enums.ChannelCodeEnum;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.api.service.*;
 import com.gic.haoban.manage.web.anno.IgnoreLogin;
@@ -619,7 +620,7 @@ public class WxEnterpriseController extends WebBaseController{
 	public HaobanResponse flushBindStoreList(String enterpriseId) {
 		LoginVO login = (LoginVO) AuthRequestUtil.getLoginUser();
 		String wxEnterpriseId = login.getWxEnterpriseId();
-		wxEnterpriseRelatedApiService.flushBindStoreByEnterpriseId(enterpriseId, wxEnterpriseId, login.getStaffDTO().getStaffId());
+		wxEnterpriseRelatedApiService.flushBindStoreByEnterpriseId(enterpriseId, wxEnterpriseId, login.getStaffDTO().getStaffId(), ChannelCodeEnum.SYNC_UNBIND.getCode());
 		return resultResponse(HaoBanErrCode.ERR_1);
 	}