Merge branch 'feature/1006244' into 'master'

feat: [1006247] 应用大小图

See merge request rays/pcloud-book!1479

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

 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.service.ActivityService;
 import com.pcloud.common.utils.ListUtils;
 import com.pcloud.common.utils.ResponseHandleUtil;
@@ -40,4 +41,17 @@ public class MemberActivityConsr {
         }
         return new HashMap<>();
     }
+
+    public Map<Long, ActivityBaseInfoWithPriceDTO> mapMemberActivityBaseWithPrice(List<Long> activityIds) {
+        if (ListUtils.isEmpty(activityIds)) {
+            return new HashMap<>();
+        }
+        log.info("查平台会员活动信息,activityIds="+activityIds);
+        try {
+            return ResponseHandleUtil.parseMap(activityService.mapMemberActivityBaseWithPrice(activityIds), Long.class,ActivityBaseInfoWithPriceDTO.class);
+        } catch (Exception e) {
+            log.error("查平台会员活动信息activityService.mapMemberActivityBaseWithPrice" +e.getMessage(), e);
+        }
+        return new HashMap<>();
+    }
 }

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

@@ -116,6 +116,7 @@ import com.pcloud.channelcenter.wechat.dto.AccountSettingDto;
 import com.pcloud.channelcenter.wechat.entity.AccountSetting;
 import com.pcloud.channelcenter.wechat.entity.Message;
 import com.pcloud.combinedmarketing.memberActivity.dto.ActivityBaseInfoDTO;
+import com.pcloud.combinedmarketing.memberActivity.dto.ActivityBaseInfoWithPriceDTO;
 import com.pcloud.common.core.aspect.ParamLog;
 import com.pcloud.common.core.constant.AdviserTaskConstants;
 import com.pcloud.common.core.constant.MQTopicProducer;
@@ -1051,18 +1052,19 @@ public class ResourcePageBizImpl implements ResourcePageBiz {
             return;
         }
         List<Long> serveIds = itemVOS.stream().map(ResourcePageItemVO::getServeId).distinct().collect(Collectors.toList());
-        Map<Long, ActivityBaseInfoDTO> baseInfoDTOMap = memberActivityConsr.mapMemberActivityBase(serveIds);
+        Map<Long, ActivityBaseInfoWithPriceDTO> baseInfoDTOMap = memberActivityConsr.mapMemberActivityBaseWithPrice(serveIds);
         if (MapUtils.isEmpty(baseInfoDTOMap)) {
             return;
         }
         for (ResourcePageItemVO itemVO : itemVOS) {
-            ActivityBaseInfoDTO baseInfoDTO = baseInfoDTOMap.get(itemVO.getServeId());
+            ActivityBaseInfoWithPriceDTO baseInfoDTO = baseInfoDTOMap.get(itemVO.getServeId());
             itemVO.setTypeName("平台会员活动");
             if (null != baseInfoDTO) {
                 itemVO.setServeName(baseInfoDTO.getTitle());
                 itemVO.setServePic(baseInfoDTO.getSquareImg());
                 itemVO.setRemark(baseInfoDTO.getRemark());
                 itemVO.setTransverseImg(baseInfoDTO.getTransverseImg());
+                itemVO.setPrice(baseInfoDTO.getMarketPrice().doubleValue());
             }
         }
     }