Merge remote-tracking branch 'origin/master' into bugfix/2023-07-06

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

@@ -120,5 +120,5 @@ public interface HandoverService {
      * @return
      */
     public List<HandoverStaffFriendCountDTO> listFriendCountByWxStaffIds(String wxEnterpriseId, List<String> staffIds);
-
+    TabHandoverStaff getHandoverStaff(String wxEnterpriseId, String wxUserId);
 }

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

@@ -176,8 +176,8 @@ public class HandoverServiceImpl implements HandoverService {
             staffClerkRelationService.cleanStaffClerk(handoverStaff.getWxEnterpriseId(), staffIds);
         }
     }
-
-    private TabHandoverStaff getHandoverStaff(String wxEnterpriseId, String wxUserId) {
+    @Override
+    public TabHandoverStaff getHandoverStaff(String wxEnterpriseId, String wxUserId) {
         TabHaobanStaff haobanStaff = staffMapper.getNoStatusByWxUserIds(wxEnterpriseId, wxUserId);
         if (null == haobanStaff) {
             logger.info("对应的staff不存在：{}", wxUserId);

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

@@ -471,12 +471,14 @@ public class AuditApiServiceImpl implements AuditApiService {
         if (clerkDTO == null) {
             return 0;
         }
+        logger.info("审核查询导购type：{}",JSON.toJSONString(clerkDTO));
         List<String> storeIdList = new ArrayList<>();
         Integer clerkType = clerkDTO.getClerkType();
         String storeId = clerkDTO.getStoreId();
-        if (clerkType == 2) {
+        if (clerkType >= 2) {
             // 如果null,说明是所有门店
             storeIdList = staffApiService.getHaoBanStoreIdsRolesByClerkId(clerkId, wxEnterpriseId);
+            logger.info("审核查询门店id：{}",JSON.toJSONString(storeIdList));
             if (CollectionUtils.isEmpty(storeIdList)) {
                 return 0;
             }

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

@@ -99,15 +99,27 @@ public class HandoverOperationApiServiceImpl implements HandoverOperationApiServ
      */
     private List<QywxUnassignedInfoDTO> getAllQywxUnassigned(String wxEnterpriseId) {
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId);
-        List<QywxUnassignedInfoDTO> ret = new ArrayList<>();
+        //这里改成LinkedList，避免使用ArrayList导致频繁扩容，从而减少内存的浪费
+        List<QywxUnassignedInfoDTO> ret = new LinkedList<>();
         QywxGetUnassignedListDTO unassignedListDTO = null;
         String cursor = null;
         do {
             //离职成员客户列表
             unassignedListDTO = qywxUserApiService.getUnassignedList(qwDTO.getThirdCorpid(), qwDTO.getSelf3thSecret(), cursor , qwDTO.isSelf(),qwDTO.getUrlHost());
             cursor = unassignedListDTO.getNextCursor();
-            if (CollectionUtils.isNotEmpty(unassignedListDTO.getInfo())) {
-                ret.addAll(unassignedListDTO.getInfo());
+            List<QywxUnassignedInfoDTO> infoList = unassignedListDTO.getInfo();
+            if (CollectionUtils.isNotEmpty(infoList)) {
+                //这里过滤staff成员id，避免ret数组过大
+                ret.addAll(infoList);
+                //根据handoverUserid去重
+                List<QywxUnassignedInfoDTO> collect = infoList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(QywxUnassignedInfoDTO::getHandoverUserid))), ArrayList::new));
+                for (QywxUnassignedInfoDTO dto : collect){
+                    String handoverUserid = dto.getHandoverUserid();
+                    TabHandoverStaff handoverStaff = handoverService.getHandoverStaff(wxEnterpriseId, handoverUserid);
+                    if (null == handoverStaff) {
+                        ret = ret.stream().filter(d -> !d.getHandoverUserid().equals(handoverUserid)).collect(Collectors.toList());
+                    }
+                }
             }
         } while (StringUtils.isNotBlank(cursor) && unassignedListDTO.getErrcode() == 0);
         if (CollectionUtils.isEmpty(ret)) {

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

@@ -267,7 +267,7 @@
     </select>
 
     <select id="getAuditCount" resultType="int">
-        select count(*) from tab_haoban_audit where wx_enterprise_id=#{wxEnterpriseId} and enterprise_id=#{enterpriseId}
+        select count(*) from tab_haoban_audit where wx_enterprise_id=#{wxEnterpriseId} and enterprise_id=#{enterpriseId} and status_flag = 1
         <if test="null != storeIds">
             and
             ( commit_store_id in