Merge branch 'feature/xgh/2502朋友圈' into 'master'

Feature/xgh/2502朋友圈

See merge request !2672

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

@@ -443,6 +443,8 @@ public interface TabHaobanExternalClerkRelatedMapper {
      */
     String getMemberIdByExternalId(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("externalUserId") String externalUserId);
 
+    String getEnterpriseMemberIdByExternalId(@Param("enterpriseId")String enterpriseId, @Param("externalUserId") String externalUserId);
+
     int halfFriendCount(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("storeId")String storeId, @Param("clerkId")String clerkId, @Param("staffId")String staffId);
 
     List<TabHaobanExternalClerkRelated> halfFriendPage(@Param("wxEnterpriseId") String wxEnterpriseId, @Param("storeId")String storeId, @Param("clerkId")String clerkId, @Param("staffId")String staffId,  @Param("type")int type);

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

@@ -6,6 +6,7 @@ import com.gic.commons.util.PageHelperUtils;
 import com.gic.commons.util.UniqueIdUtils;
 import com.gic.haoban.manage.api.dto.moment.QwMomentPlanDataDTO;
 import com.gic.haoban.manage.api.qdto.moment.PlanDataListQDTO;
+import com.gic.haoban.manage.service.dao.mapper.TabHaobanExternalClerkRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.moment.QwMomentPlanAttendMapper;
 import com.gic.haoban.manage.service.dao.mapper.moment.QwMomentPlanDataMapper;
 import com.gic.haoban.manage.service.entity.moment.TabQwMomentPlanAttend;
@@ -29,7 +30,7 @@ public class QwMomentPlanDataServiceImpl implements QwMomentPlanDataService {
     @Autowired
     private QwMomentPlanDataMapper qwMomentPlanDataMapper ;
     @Autowired
-    private ExternalClerkRelatedService externalClerkRelatedService ;
+    private TabHaobanExternalClerkRelatedMapper tabHaobanExternalClerkRelatedMapper ;
     @Autowired
     private QwMomentPlanAttendMapper qwMomentPlanAttendMapper ;
     @Autowired
@@ -66,7 +67,7 @@ public class QwMomentPlanDataServiceImpl implements QwMomentPlanDataService {
         if(CollectionUtils.isNotEmpty(likeList)) {
             for(MomentComments item : likeList) {
                 String externalUserid = item.getExternal_userid() ;
-                String memberId = this.externalClerkRelatedService.getMemberIdByExternalId(task.getWxEnterpriseId(),externalUserid) ;
+                String memberId = this.tabHaobanExternalClerkRelatedMapper.getEnterpriseMemberIdByExternalId(task.getEnterpriseId(),externalUserid) ;
                 if(StringUtils.isBlank(memberId)) {
                     set.add(externalUserid) ;
                     continue;
@@ -92,7 +93,7 @@ public class QwMomentPlanDataServiceImpl implements QwMomentPlanDataService {
                     data.setCommentFlag(1);
                     data.setCommentTime(new Date(item.getCreate_time()*1000));
                 }else {
-                    String memberId = this.externalClerkRelatedService.getMemberIdByExternalId(task.getWxEnterpriseId(),externalUserid) ;
+                    String memberId = this.tabHaobanExternalClerkRelatedMapper.getEnterpriseMemberIdByExternalId(task.getEnterpriseId(),externalUserid) ;
                     if(StringUtils.isBlank(memberId)) {
                         continue;
                     }

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

@@ -922,6 +922,12 @@
         limit 1
     </select>
 
+    <select id="getEnterpriseMemberIdByExternalId"  resultType="java.lang.String">
+        select member_id from tab_haoban_external_clerk_related  where enterprise_id = #{enterpriseId}
+                                                  and external_user_id = #{externalUserId} and status_flag =1 limit 1
+    </select>
+
+
     <select id="halfFriendCount" resultType="java.lang.Integer">
         select count(*) from tab_haoban_external_clerk_related where wx_enterprise_id = #{wxEnterpriseId} and status_flag in (1,3,4)
                                                                  and staff_id = #{staffId} and clerk_id=#{clerkId} and store_id = #{storeId}

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

@@ -598,7 +598,7 @@ public class QwMomentController {
         List<JSONObject> esList = this.queryDataBatch(enterpriseId, memberIdList, returnFields);
         if(CollectionUtils.isEmpty(esList)) {
             logger.info("会员查询无");
-            return null ;
+            return new HashMap<>() ;
         }
         logger.info("会员信息={}",JSONObject.toJSONString(esList));
         List<MemberDataDTO> list = JSONArray.parseArray(JSONArray.toJSONString(esList),MemberDataDTO.class);

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/moment/QwMomentController.java

@@ -79,7 +79,7 @@ public class QwMomentController {
         }
         ServiceResponse<Page<QwMomentPlanWxaDTO>> pageResp = this.qwMomentApiService.planListWxa(qdto) ;
         Page<PlanListVO> retPage = PageHelperUtils.changePageToCurrentPage(pageResp.getResult(), PlanListVO.class);
-        if(qo.getPlanStatus()==1) {
+        if(qo.getPlanStatus()==1 && null != retPage && CollectionUtils.isNotEmpty(retPage.getResult())) {
             for(PlanListVO vo : retPage.getResult()) {
                 // 作为失效的数量返回
                 vo.setNotExecNum(vo.getTotalNum()-vo.getExecNum());