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/service/ExternalClerkRelatedApiService.java

@@ -8,7 +8,6 @@ import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
 import com.gic.haoban.manage.api.dto.ExternalClerkRelatedShortInfoDTO;
 import com.gic.haoban.manage.api.dto.FriendMemberStatusDTO;
 
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -28,13 +27,6 @@ public interface ExternalClerkRelatedApiService {
      */
     List<ExternalClerkRelatedDTO> listByMemberIdAndWxEnterpriseId(String memberId, String wxEnterpriseId, String enterpriseId);
 
-    @Deprecated
-    List<ExternalClerkRelatedDTO> listByEnterpriseIdAndDate(String enterpriseId, Date date);
-
-    @Deprecated
-    Page<ExternalClerkRelatedDTO> pageMemberUnionByParams(List<String> staffIdList, List<String> sendMemberIds,
-                                                          String enterpriseId, BasePageInfo pageInfo);
-
     List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserId(String staffId, String wxEnterpriseId);
 
     List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserIds(List<String> staffIdList, String wxEnterpriseId);
@@ -140,16 +132,6 @@ public interface ExternalClerkRelatedApiService {
     List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberIds(String wxEnterpriseId, List<String> memberIds);
 
     /**
-     * 这个是所有企业下的会员关联关系 性能很差
-     * 获取会员下的关联关系列表
-     * @param memberId
-     * @return
-     */
-    @Deprecated
-    List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberId(String memberId);
-
-
-    /**
      * 通过会员id查询好友门店id
      *
      * @param memberId 成员身份

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

@@ -49,7 +49,7 @@ public interface TabHaobanExternalClerkRelatedMapper {
      * @author mozhu
      * @date 2022-02-10 10:11:21
      */
-    List<TabHaobanExternalClerkRelated> listByExTernalUseridAndWxEnterpriseId(@Param("externalUserid") String externalUserid,
+    List<TabHaobanExternalClerkRelated> listByExternalUseridAndWxEnterpriseId(@Param("externalUserid") String externalUserid,
                                                                               @Param("wxEnterpriseId") String wxEnterpriseId,
                                                                               @Param("statusFlags") List<String> statusFlags);
 

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/entity/fee/TabHaobanQywxFeeAccountStaff.java

@@ -20,10 +20,6 @@ public class TabHaobanQywxFeeAccountStaff implements Serializable {
 
     private String wxEnterpriseId;
     /**
-     * 用户id
-     */
-    private String wxUserId;
-    /**
      * 员工id
      */
     private String staffId;
@@ -77,14 +73,6 @@ public class TabHaobanQywxFeeAccountStaff implements Serializable {
         this.wxEnterpriseId = wxEnterpriseId;
     }
 
-    public String getWxUserId() {
-        return wxUserId;
-    }
-
-    public void setWxUserId(String wxUserId) {
-        this.wxUserId = wxUserId;
-    }
-
     public String getStaffId() {
         return staffId;
     }

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

@@ -99,10 +99,10 @@ public class ExternalClerkRelatedServiceImpl implements ExternalClerkRelatedServ
         }
         String enterpriseId = tabHaobanStaffClerkRelations.get(0).getEnterpriseId();
         //该企微该会员所有关联关系解除后通知会员
-        List<TabHaobanExternalClerkRelated> list = mapper.listByExTernalUseridAndWxEnterpriseId(dto.getExternalUserid(), wxEnterpriseId, Arrays.asList("1", "3", "4"));
+        List<TabHaobanExternalClerkRelated> list = mapper.listByExternalUseridAndWxEnterpriseId(dto.getExternalUserid(), wxEnterpriseId, Arrays.asList("1", "3", "4"));
         if (CollectionUtils.isEmpty(list)) {
             //删除的好友关系
-            List<TabHaobanExternalClerkRelated> haobanExternalClerkRelatedList = mapper.listByExTernalUseridAndWxEnterpriseId(dto.getExternalUserid(), wxEnterpriseId, Collections.singletonList("2"));
+            List<TabHaobanExternalClerkRelated> haobanExternalClerkRelatedList = mapper.listByExternalUseridAndWxEnterpriseId(dto.getExternalUserid(), wxEnterpriseId, Collections.singletonList("2"));
             for (TabHaobanExternalClerkRelated externalClerkRelated : haobanExternalClerkRelatedList) {
                 String memberId = externalClerkRelated.getMemberId();
                 logger.info("通知会员 删除会员后更新为非企微好友 memberId:{}", memberId);

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

 package com.gic.haoban.manage.service.service.out.impl;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.redisson.api.RRateLimiter;
-import org.redisson.api.RateIntervalUnit;
-import org.redisson.api.RateType;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
@@ -32,27 +13,14 @@ import com.gic.haoban.base.api.common.BasePageInfo;
 import com.gic.haoban.base.api.common.ServiceResponse;
 import com.gic.haoban.base.api.common.errCode.HaoBanErrCodeCommon;
 import com.gic.haoban.common.utils.PageUtil;
-import com.gic.haoban.manage.api.dto.AlertMessageDTO;
-import com.gic.haoban.manage.api.dto.ClerkStaffWxUserDTO;
-import com.gic.haoban.manage.api.dto.ExternalClerkRelatedDTO;
-import com.gic.haoban.manage.api.dto.ExternalClerkRelatedShortInfoDTO;
-import com.gic.haoban.manage.api.dto.FriendMemberStatusDTO;
-import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
+import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.enums.AlertTypeEnum;
 import com.gic.haoban.manage.api.service.CheckQywxSettingApiService;
 import com.gic.haoban.manage.api.service.ExternalClerkRelatedApiService;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.service.config.Config;
-import com.gic.haoban.manage.service.dao.mapper.ExternalUseridLogMapper;
-import com.gic.haoban.manage.service.dao.mapper.MemberUnionidRelatedMapper;
-import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
-import com.gic.haoban.manage.service.dao.mapper.TabHaobanStaffClerkRelationMapper;
-import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper;
-import com.gic.haoban.manage.service.entity.MemberUnionidRelated;
-import com.gic.haoban.manage.service.entity.TabExternalUseridLog;
-import com.gic.haoban.manage.service.entity.TabHaobanExternalClerkRelated;
-import com.gic.haoban.manage.service.entity.TabHaobanStaffClerkRelation;
-import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
+import com.gic.haoban.manage.service.dao.mapper.*;
+import com.gic.haoban.manage.service.entity.*;
 import com.gic.haoban.manage.service.entity.ext.MemberStaffRelExtDO;
 import com.gic.haoban.manage.service.pojo.QywxTagSyncInfoPojo;
 import com.gic.haoban.manage.service.service.WxEnterpriseService;
@@ -64,6 +32,20 @@ import com.gic.wechat.api.dto.qywx.QywxNewExternalUseridDTO;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.redisson.api.RRateLimiter;
+import org.redisson.api.RateIntervalUnit;
+import org.redisson.api.RateType;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 @Service
 public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedApiService {
@@ -110,29 +92,14 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     }
 
     @Override
-    public List<ExternalClerkRelatedDTO> listByEnterpriseIdAndDate(
-            String enterpriseId, Date date) {
-        List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listByEnterpriseIdAndDate(enterpriseId, date);
-        return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class, list);
-    }
-
-    @Override
-    public Page<ExternalClerkRelatedDTO> pageMemberUnionByParams(List<String> staffIdList, List<String> sendMemberIds,
-                                                                 String enterpriseId, BasePageInfo pageInfo) {
-        PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
-        return PageUtil.changePageHelperToCurrentPage(tabHaobanExternalClerkRelatedMapper.pageMemberUnionByParams(staffIdList, sendMemberIds, enterpriseId), ExternalClerkRelatedDTO.class);
-    }
-
-    @Override
     public List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserId(String staffId, String wxEnterpriseId) {
-
         return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class, tabHaobanExternalClerkRelatedMapper.listByWxEnterpriseIdAndWxUserId(staffId, wxEnterpriseId));
     }
 
     @Override
     public List<ExternalClerkRelatedDTO> listByWxEnterpriseIdAndWxUserIds(List<String> staffIdList, String wxEnterpriseId) {
         if (CollectionUtils.isEmpty(staffIdList)) {
-            return Collections.EMPTY_LIST;
+            return Collections.emptyList();
         }
         return EntityUtil.changeEntityListByJSON(ExternalClerkRelatedDTO.class, tabHaobanExternalClerkRelatedMapper.listByWxEnterpriseIdAndWxUserIds(staffIdList, wxEnterpriseId));
     }
@@ -147,8 +114,7 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     public Page<ExternalClerkRelatedDTO> pageExternalClerk(String wxEnterpriseId, String staffId, List<Integer> statusFlags, BasePageInfo pageInfo) {
         PageHelper.startPage(pageInfo);
         List<TabHaobanExternalClerkRelated> ret = tabHaobanExternalClerkRelatedMapper.listByWxEnterpriseIdAndWxUserIdAndStatus(wxEnterpriseId, staffId, statusFlags);
-        Page<ExternalClerkRelatedDTO> retPage = PageUtil.changePageHelperToCurrentPage(new PageInfo<>(ret), ExternalClerkRelatedDTO.class);
-        return retPage;
+        return PageUtil.changePageHelperToCurrentPage(new PageInfo<>(ret), ExternalClerkRelatedDTO.class);
     }
 
     @Override
@@ -296,17 +262,8 @@ public class ExternalClerkRelatedApiServiceImpl implements ExternalClerkRelatedA
     }
 
     @Override
-    public List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberId(String memberId) {
-        if (StringUtils.isBlank(memberId)) {
-            return null;
-        }
-        List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listByMemberId(memberId, null);
-        return EntityUtil.changeEntityListNew(ExternalClerkRelatedShortInfoDTO.class, list);
-    }
-
-    @Override
     public List<ExternalClerkRelatedShortInfoDTO> listExternalClerkByMemberId(String memberId, String enterpriseId) {
-        if (StringUtils.isAnyBlank(memberId, enterpriseId)) {
+        if (StringUtils.isAnyBlank(memberId)) {
             return null;
         }
         List<TabHaobanExternalClerkRelated> list = tabHaobanExternalClerkRelatedMapper.listByMemberId(memberId, enterpriseId);

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

@@ -327,7 +327,6 @@ public class HaobanQywxFeeApiServiceImpl implements HaobanQywxFeeApiService {
                 tabHaobanQywxFeeAccountStaff.setFeeAccountStaffId(UniqueIdUtils.uniqueLong());
                 tabHaobanQywxFeeAccountStaff.setCorpId(corpid);
                 tabHaobanQywxFeeAccountStaff.setWxEnterpriseId(wxEnterpriseId);
-                tabHaobanQywxFeeAccountStaff.setWxUserId(userid);
                 if (tabHaobanStaff != null) {
                     String staffId = tabHaobanStaff.getStaffId();
                     tabHaobanQywxFeeAccountStaff.setStaffId(staffId);

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

@@ -304,7 +304,7 @@
     </select>
 
 
-    <select id="listByExTernalUseridAndWxEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String">
+    <select id="listByExternalUseridAndWxEnterpriseId" resultMap="BaseResultMap" parameterType="java.lang.String">
         select
         <include refid="Base_Column_List"/>
         from tab_haoban_external_clerk_related

haoban-manage3-service/src/main/resources/mapper/fee/TabHaobanQywxFeeAccountStaffMapper.xml

@@ -7,7 +7,6 @@
         <result property="orderId" column="order_id" jdbcType="VARCHAR"/>
         <result property="corpId" column="corp_id" jdbcType="VARCHAR"/>
         <result property="wxEnterpriseId" column="wx_enterprise_id" jdbcType="VARCHAR"/>
-        <result property="wxUserId" column="wx_user_id" jdbcType="VARCHAR"/>
         <result property="staffId" column="staff_id" jdbcType="VARCHAR"/>
         <result property="activeCode" column="active_code" jdbcType="VARCHAR"/>
         <result property="accountType" column="account_type" jdbcType="INTEGER"/>
@@ -17,7 +16,7 @@
 
     <sql id="Base_Column_List">
         fee_account_staff_id
-        , order_id, corp_id, wx_enterprise_id, wx_user_id, staff_id, active_code, account_type, expire_time, active_time
+        , order_id, corp_id, wx_enterprise_id, staff_id, active_code, account_type, expire_time, active_time
     </sql>
 
     <!--查询单个-->
@@ -71,18 +70,18 @@
 
     <!--新增所有列-->
     <insert id="insert" keyProperty="feeAccountId" useGeneratedKeys="true">
-        insert into tab_haoban_qywx_fee_account_staff(fee_account_staff_id, order_id, corp_id, wx_enterprise_id, wx_user_id,
+        insert into tab_haoban_qywx_fee_account_staff(fee_account_staff_id, order_id, corp_id, wx_enterprise_id,
                                                       staff_id, active_code, account_type, expire_time, active_time)
-        values (#{feeAccountStaffId}, #{orderId}, #{corpId}, #{wxEnterpriseId}, #{wxUserId}, #{staffId}, #{activeCode},
+        values (#{feeAccountStaffId}, #{orderId}, #{corpId}, #{wxEnterpriseId}, #{staffId}, #{activeCode},
                 #{accountType}, #{expireTime}, #{activeTime})
     </insert>
 
     <insert id="insertBatch" keyProperty="feeAccountId" useGeneratedKeys="true">
-        insert into tab_haoban_qywx_fee_account_staff(fee_account_staff_id, order_id, corp_id, wx_enterprise_id, wx_user_id,
+        insert into tab_haoban_qywx_fee_account_staff(fee_account_staff_id, order_id, corp_id, wx_enterprise_id,
         staff_id, active_code, account_type, expire_time, active_time)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.feeAccountStaffId}, #{entity.orderId}, #{entity.corpId}, #{entity.wxEnterpriseId}, #{entity.wxUserId},
+            (#{entity.feeAccountStaffId}, #{entity.orderId}, #{entity.corpId}, #{entity.wxEnterpriseId},
             #{entity.staffId}, #{entity.activeCode}, #{entity.accountType}, #{entity.expireTime}, #{entity.activeTime})
         </foreach>
     </insert>
@@ -101,9 +100,6 @@
             <if test="wxEnterpriseId != null and wxEnterpriseId != ''">
                 wx_enterprise_id = #{wxEnterpriseId},
             </if>
-            <if test="wxUserId != null and wxUserId != ''">
-                wx_user_id = #{wxUserId},
-            </if>
             <if test="staffId != null and staffId != ''">
                 staff_id = #{staffId},
             </if>