积分问题
This commit is contained in:
@@ -68,7 +68,7 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
|
|||||||
public Map<String, Object> getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId) {
|
public Map<String, Object> getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId) {
|
||||||
Map<String, Object> result = new HashMap<>(2);
|
Map<String, Object> result = new HashMap<>(2);
|
||||||
MkPointsUser pointsUser = pointsUserService.getPointsUser(shopId, null, userId);
|
MkPointsUser pointsUser = pointsUserService.getPointsUser(shopId, null, userId);
|
||||||
List<MkPointsGoods> list = new ArrayList<>();
|
List<MkPointsGoods> list;
|
||||||
boolean exists = mkPointsConfigService.exists(query().eq(MkPointsConfig::getShopId, shopId).eq(MkPointsConfig::getEnablePointsMall, 1));
|
boolean exists = mkPointsConfigService.exists(query().eq(MkPointsConfig::getShopId, shopId).eq(MkPointsConfig::getEnablePointsMall, 1));
|
||||||
if (exists) {
|
if (exists) {
|
||||||
PageHelper.startPage(page, size);
|
PageHelper.startPage(page, size);
|
||||||
@@ -82,8 +82,8 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
|
|||||||
goods.setCouponInfo(one);
|
goods.setCouponInfo(one);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
|
||||||
result.put("pointsGoods", PageUtil.convert(new PageInfo<>(list)));
|
result.put("pointsGoods", PageUtil.convert(new PageInfo<>(list)));
|
||||||
|
}
|
||||||
result.put("pointsUser", pointsUser == null ? "" : pointsUser);
|
result.put("pointsUser", pointsUser == null ? "" : pointsUser);
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user