diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java index a92367873..dae88f5cd 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java @@ -68,7 +68,7 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId) { Map result = new HashMap<>(2); MkPointsUser pointsUser = pointsUserService.getPointsUser(shopId, null, userId); - List list = new ArrayList<>(); + List list; boolean exists = mkPointsConfigService.exists(query().eq(MkPointsConfig::getShopId, shopId).eq(MkPointsConfig::getEnablePointsMall, 1)); if (exists) { PageHelper.startPage(page, size); @@ -82,8 +82,8 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl(list))); } - result.put("pointsGoods", PageUtil.convert(new PageInfo<>(list))); result.put("pointsUser", pointsUser == null ? "" : pointsUser); return result; }