fix: 應用廣場收藏問題

src/main/java/cn/com/poc/agent_application/rest/impl/BizAgentApplicationMallRestImpl.java

@@ -11,6 +11,8 @@ import cn.com.poc.agent_application.entity.BizAgentApplicationPublishEntity;
 import cn.com.poc.agent_application.entity.BizMemberAgentApplicationCollectEntity;
 import cn.com.poc.agent_application.query.MallAgentApplicationQueryCondition;
 import cn.com.poc.agent_application.query.MallAgentApplicationQueryItem;
+import cn.com.poc.agent_application.query.MemberCollectQueryCondition;
+import cn.com.poc.agent_application.query.MemberCollectQueryItem;
 import cn.com.poc.agent_application.rest.BizAgentApplicationMallRest;
 import cn.com.poc.agent_application.service.BizAgentApplicationCategoryService;
 import cn.com.poc.agent_application.service.BizAgentApplicationMallService;
@@ -19,6 +21,7 @@ import cn.com.poc.agent_application.service.BizMemberAgentApplicationCollectServ
 import cn.com.poc.common.annotation.RedisLimit;
 import cn.com.poc.common.constant.CommonConstant;
 import cn.com.poc.common.constant.XLangConstant;
+import cn.com.poc.common.utils.BlContext;
 import cn.com.poc.common.utils.StringUtils;
 import cn.com.yict.framemax.core.i18n.I18nMessageException;
 import cn.com.yict.framemax.data.model.PagingInfo;
@@ -113,20 +116,18 @@ public class BizAgentApplicationMallRestImpl implements BizAgentApplicationMallR
             }
         }
         List<MallAgentApplicationQueryItem> items = bizAgentApplicationMallService.mallAgentApplicationQuery(mallAgentApplicationQueryCondition, pagingInfo);
+        MemberCollectQueryCondition collectQueryCondition = new MemberCollectQueryCondition();
+        collectQueryCondition.setMemberId(BlContext.getCurrentUserNotException().getUserId());
+        collectQueryCondition.setIsCollect(CommonConstant.YOrN.Y);
+        List<MemberCollectQueryItem> memberCollectQueryItems = bizMemberAgentApplicationCollectService.queryMemberCollect(collectQueryCondition, null);
 
         for (MallAgentApplicationQueryItem item : items) {
             BizAgentApplicationMallDto mallDto = BizAgentApplicationMallConvert.itemToDto(item);
             // 如果应用上架了
             if (CommonConstant.YOrN.Y.equals(mallDto.getIsSale())) {
                 // 设置当前用户是否收藏了
-                if (mallDto.getBaseInfo() != null) {
-                    BizMemberAgentApplicationCollectEntity collect = bizMemberAgentApplicationCollectService.getByAgentId(mallDto.getBaseInfo().getAgentId());
-                    if (collect != null) {
-                        mallDto.setIsCollect(collect.getIsCollect());
-                    } else {
-                        mallDto.setIsCollect(CommonConstant.YOrN.N);
-                    }
-                }
+                String agentId = mallDto.getBaseInfo().getAgentId();
+                mallDto.setIsCollect(memberCollectQueryItems.stream().anyMatch(v -> agentId.equals(v.getAgentId())) ? CommonConstant.YOrN.Y : CommonConstant.YOrN.N);
                 resultList.add(mallDto);
             }
         }