Merge branch 'feature/memberbuy' into 'master'

feat:[none]会员包优化

See merge request rays/pcloud-book!1683

pcloud-service-book/src/main/java/com/pcloud/book/consumer/combinedmarketing/MemberActivityConsr.java

@@ -2,6 +2,7 @@ package com.pcloud.book.consumer.combinedmarketing;
 
 import com.pcloud.combinedmarketing.memberActivity.dto.ActivityBaseInfoDTO;
 import com.pcloud.combinedmarketing.memberActivity.dto.ActivityBaseInfoWithPriceDTO;
+import com.pcloud.combinedmarketing.memberActivity.dto.UserActivityQueryDTO;
 import com.pcloud.combinedmarketing.memberActivity.service.ActivityService;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.ResponseHandleUtil;
@@ -68,4 +69,25 @@ public class MemberActivityConsr {
         }
         return new ArrayList<>();
     }
+
+    /**
+     * @Description  查会员信息及购买信息
+     * @Author zhuyajie
+     * @Date 10:45 2022/9/20
+     **/
+    public Map<Long, ActivityBaseInfoWithPriceDTO> mapMemberActivityByUser(List<Long> activityIds,Long userId) {
+        if (ListUtils.isEmpty(activityIds)) {
+            return new HashMap<>();
+        }
+        UserActivityQueryDTO dto = new UserActivityQueryDTO();
+        dto.setActivityIds(activityIds);
+        dto.setUserId(userId);
+        log.info("查平台会员活动信息,activityIds="+activityIds+"=userId="+userId);
+        try {
+            return ResponseHandleUtil.parseMap(activityService.mapMemberActivityByUser(dto), Long.class,ActivityBaseInfoWithPriceDTO.class);
+        } catch (Exception e) {
+            log.error("查平台会员活动信息activityService.mapMemberActivityByUser" +e.getMessage(), e);
+        }
+        return new HashMap<>();
+    }
 }

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/ResourcePageBizImpl.java

@@ -1797,7 +1797,7 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
         } else if (ResourcePageConstants.ServeTypeEnum.WXWORK_GROUP.getValue().equals(serveType)) {
             fillWxworkGroup(itemVOS);
         } else if (ResourcePageConstants.ServeTypeEnum.MEMBER_ACTIVITY.getValue().equals(serveType)) {
-            fillMemberActivity(itemVOS);
+            fillMemberActivity(itemVOS, wechatUserId);
         } else if (ServeTypeEnum.SHOP.getValue().equals(serveType)) {
             fillChannelShop(itemVOS);
         } else if (ServeTypeEnum.RESOURCE.getValue().equals(serveType)) {
@@ -1892,13 +1892,13 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
     }
 
     @ParamLog("填充平台会员活动")
-    private void fillMemberActivity(List<? extends ResourcePageItemVO> itemVOS) {
+    private void fillMemberActivity(List<? extends ResourcePageItemVO> itemVOS, Long wechatUserId) {
         log.info("填充平台会员活动");
         if (ListUtils.isEmpty(itemVOS)) {
             return;
         }
         List<Long> serveIds = itemVOS.stream().map(ResourcePageItemVO::getServeId).distinct().collect(Collectors.toList());
-        Map<Long, ActivityBaseInfoWithPriceDTO> baseInfoDTOMap = memberActivityConsr.mapMemberActivityBaseWithPrice(serveIds);
+        Map<Long, ActivityBaseInfoWithPriceDTO> baseInfoDTOMap = memberActivityConsr.mapMemberActivityByUser(serveIds,wechatUserId);
         if (MapUtils.isEmpty(baseInfoDTOMap)) {
             return;
         }