diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/activity/ActivityApplicationService.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/activity/ActivityApplicationService.java index f04c9e2..941fa65 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/activity/ActivityApplicationService.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/activity/ActivityApplicationService.java @@ -66,7 +66,7 @@ public class ActivityApplicationService extends BaseApplicationService { Map map = activityProductList.stream().collect(Collectors.toMap(ActivityProduct::getProductId,ActivityProduct -> ActivityProduct)); UserPageProductByOperatorQueryParam queryParam = new UserPageProductByOperatorQueryParam(); queryParam.setProductIds(new ArrayList<>(map.keySet())); - List activityProductListVo = TypeConvertUtils.convert(productViewDao.selectProductByOperator(queryParam),ActivityProductListVo.class); + List activityProductListVo = TypeConvertUtils.convert(productViewDao.pageProductByOperator(queryParam),ActivityProductListVo.class); activityProductListVo.forEach(v->{ ActivityProduct av = map.get(v.getProductId()); v.setFreebie(av.getFreebie()); diff --git a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/ProductViewDao.java b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/ProductViewDao.java index 3d889fc..85bae80 100644 --- a/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/ProductViewDao.java +++ b/dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/ProductViewDao.java @@ -22,7 +22,7 @@ public interface ProductViewDao { IPage pageProductByCustomer(Page pageWithoutOrders, @Param("queryParam") UserPageProductByCustomerQueryParam queryParam); - List selectProductByOperator(@Param("queryParam") UserPageProductByOperatorQueryParam queryParam); + List pageProductByOperator(@Param("queryParam") UserPageProductByOperatorQueryParam queryParam); List selectProductByCustomerList(); }