fix：收费、删除无效代码

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

@@ -68,19 +68,6 @@ public interface MemberUnionidRelatedApiService {
      */
     List<MemberStoreDTO> listByExTernalUseridAndWxUserId(String externalUserid, String wxUserId, String storeId);
 
-
-    @Deprecated
-    String add(String wxEnterpriseId, String selfExternalUserId, String userId1, String storeId);
-
-    /**
-     * 刷新企微好友
-     *
-     * @param wxEnterpriseId
-     * @param wxUserId
-     * @param storeId
-     */
-    void freshWxFrend(String wxEnterpriseId, String wxUserId, String storeId);
-
     void cleanByCid(String cid);
 
     Page<MemberUnionidRelatedDTO> pageMemberUnionByParams(List<String> userIdList, List<String> sendMemberIds,
@@ -146,14 +133,6 @@ public interface MemberUnionidRelatedApiService {
     String addMemberUnionidRelatedNew(MemberUnionidRelatedDTO dto);
 
     /**
-     * 刷新企微好友
-     *
-     * @param res
-     */
-    @Deprecated
-    void mqFreshWxFrend(String res);
-
-    /**
      * 清楚不存在的好友关系
      *
      * @param wxEnterpriseId

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

@@ -74,7 +74,7 @@ public interface TabHaobanQywxFeeAccountStaffMapper {
     Date lastFeeInterceptTime(@Param("wxEnterpriseId") String wxEnterpriseId);
 
     /**
-     * 最后费用过期拦截数
+     * 未来30天过期拦截数
      *
      * @param wxEnterpriseId wx企业标识
      * @return int

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

@@ -67,4 +67,15 @@ public interface HaobanQywxFeeAccountStaffService {
      */
     HaobanQywxFeeDetailDTO feeIntercept(String wxEnterpriseId);
 
+
+    /**
+     * 未来30天将拦截数量
+     *
+     * @param wxEnterpriseId wx企业标识
+     * @return int
+     * @author mozhu
+     * @date 2022-08-12 13:57:00
+     */
+    int monthWillInterceptNum(String wxEnterpriseId);
+
 }

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

@@ -81,4 +81,9 @@ public class HaobanQywxFeeAccountStaffServiceImpl implements HaobanQywxFeeAccoun
         haobanQywxFeeDetailDTO.setInterceptUserNum(count);
         return haobanQywxFeeDetailDTO;
     }
+
+    @Override
+    public int monthWillInterceptNum(String wxEnterpriseId) {
+        return tabHaobanQywxFeeAccountStaffMapper.lastFeeInterceptCount(wxEnterpriseId);
+    }
 }

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

@@ -1032,67 +1032,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         return pojo;
     }
 
-    @Override
-    public String add(String wxEnterpriseId, String selfExternalUserId, String userId, String storeId) {
-        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
-        if (qwDTO == null) {
-            return "";
-        }
-        TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId, wxEnterpriseId);
-        if (staff == null) {
-            return "";
-        }
-        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_CUSTOMER.getVal());
-        if (null == secretSetting) {
-            log.info("没有配置secret");
-            return "";
-        }
-        String unionIdJson = qywxUserApiService.getCorpSelfExternalUseridInfo(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), selfExternalUserId);
-
-        ExternalUserPojo pojo = getExternalUserPojo(unionIdJson, userId, wxEnterpriseId);
-        String unionId = pojo.getUnionId();
-        String name = pojo.getName();
-        String createTime = pojo.getAddCreateTime();
-
-        MemberUnionidRelatedDTO dto = new MemberUnionidRelatedDTO();
-        String externalUserId = getExternalUserId(qwDTO.getThirdCorpid(), userId, createTime, name);
-        if (StringUtils.isBlank(externalUserId)) {
-            log.error("请求外部联系人id失败,userId:{}", userId);
-            return "";
-        }
-        dto.setExternalUserid(externalUserId);
-        dto.setWxEnterpriseId(wxEnterpriseId);
-        dto.setUnionid(unionId);
-
-        dto.setExternalName(name);
-        dto.setAddCreateTime(createTime);
-        dto.setWxUserId(userId);
-        dto.setAvatar(pojo.getAvatar());
-        if (StringUtils.isBlank(unionId)) {
-            return "";
-        }
-        dto.setSuiteid(secretSetting.getSecretVal());
-        MemberUnionidRelatedDTO exsitDTO = memberUnionRelatedService.getByParams(userId, wxEnterpriseId, name, createTime);
-        String uuid = "";
-        if (exsitDTO == null) {
-            dto.setUnionid(unionId);
-            //更新对外联系人id
-            dto.setSelfExternalUserid(selfExternalUserId);
-            uuid = memberUnionRelatedService.addMemberUnionidRelated(dto);
-        } else {
-            exsitDTO.setExternalUserid(externalUserId);
-            exsitDTO.setUnionid(unionId);
-            //更新对外联系人id
-            exsitDTO.setSelfExternalUserid(selfExternalUserId);
-            memberUnionRelatedService.update(exsitDTO);
-            uuid = exsitDTO.getMemberUnionidRelatedId();
-        }
-
-        //新增门店和导购的关联关系
-        insertExternalClerkRelated(dto);
-        return uuid;
-    }
-
     @Deprecated
     private void insertExternalClerkRelated(MemberUnionidRelatedDTO dto) {
         log.info("新增外部联系人开始：{}", JSONObject.toJSONString(dto));
@@ -1316,59 +1255,6 @@ public class MemberUnionidRelatedApiServiceImpl implements MemberUnionidRelatedA
         return EntityUtil.changeEntityListByJSON(MemberUnionidRelatedDTO.class, list);
     }
 
-    @Override
-    public void freshWxFrend(String wxEnterpriseId, String wxUserId, String storeId) {
-        log.info("【刷下好友】wxUserId={}", wxUserId);
-        WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
-        String wxRes = qywxUserApiService.listExternalUserid(qwDTO.getThirdCorpid(), config.getWxSuiteid(), wxUserId);
-        List<MemberUnionidRelatedDTO> list = this.getByWxUserIdAndWxEnterpriseId(wxUserId, wxEnterpriseId);
-        List<String> externalUserIdList = list.stream().map(external -> external.getExternalUserid())
-                .collect(Collectors.toList());
-        JSONArray externalArr = JSON.parseArray(wxRes);
-        for (String externalUserId : externalUserIdList) {
-            if (!externalArr.contains(externalUserId)) {
-                //删除成员和外部联系人关系
-                MemberUnionidRelatedDTO dto = new MemberUnionidRelatedDTO();
-                dto.setExternalUserid(externalUserId);
-                dto.setWxUserId(wxUserId);
-                memberUnionRelatedService.delMemberUnionidRelated(dto);
-                //删除导购和外部联系人关系
-                externalClerkRelatedService.delByUserIdAndExternalUserId(dto);
-            }
-        }
-
-        SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CONTACT_CUSTOMER.getVal());
-        if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
-            log.info("没有配置客户联系secret:{}", wxEnterpriseId);
-            return;
-        }
-        String res = qywxUserApiService.listSelfExternalUserid(qwDTO.getDkCorpid(), secretSetting.getSecretVal(), wxUserId);
-        log.info("【刷下好友】res={}", res);
-        if (StringUtils.isBlank(res)) {
-            return;
-        }
-        JSONArray jsonArr = JSON.parseArray(res);
-        if (jsonArr.size() == 0) {
-            return;
-        }
-
-        for (Object object : jsonArr) {
-            this.add(wxEnterpriseId, object.toString(), wxUserId, storeId);
-        }
-    }
-
-    @Override
-    public void mqFreshWxFrend(String res) {
-        JSONObject json = JSON.parseObject(res);
-        String wxEnterpriseId = json.getString("wxEnterpriseId");
-        String wxUserId = json.getString("wxUserId");
-        String storeId = json.getString("storeId");
-        log.info("【刷下微信好友】wxEnterpriseId={}.wxUserId={},storeId={}", wxEnterpriseId, wxUserId, storeId);
-        if (StringUtils.isAnyBlank(wxEnterpriseId, wxUserId, storeId)) {
-            return;
-        }
-        freshWxFrend(wxEnterpriseId, wxUserId, storeId);
-    }
 
     @Override
     public void cleanByCid(String cid) {

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

@@ -49,6 +49,7 @@
                 and intercept_time <![CDATA[ >= ]]> #{endDate}
             </if>
         </where>
+        order by intercept_time desc
     </select>