diff --git a/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java b/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java index 0f4d53eeb..24fef3633 100644 --- a/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java +++ b/cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java @@ -39,8 +39,9 @@ public class UPointGoodsController { @GetMapping("/page") public CzgResult> getPointsGoodsSettingPage(@RequestParam(defaultValue = "1", required = false) Integer page, @RequestParam(defaultValue = "10", required = false) Integer size, + @RequestParam(required = false) String goodsCategory, Long shopId) { - Page data = pointsGoodsService.getPointsGoodsPageByUser(page, size, shopId, StpKit.USER.getLoginIdAsLong()); + Page data = pointsGoodsService.getPointsGoodsPageByUser(page, size, shopId, goodsCategory, StpKit.USER.getLoginIdAsLong()); return CzgResult.success(data); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java index a4a2eb05d..25d8629bf 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java @@ -17,7 +17,7 @@ public interface MkPointsGoodsService extends IService { Page getPointsGoodsPage(BaseQueryParam param, Long shopId); - Page getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, Long userId); + Page getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId); Page getGoodsRecordPage(Integer page, Integer size, Long shopId, Long userId); @@ -29,9 +29,9 @@ public interface MkPointsGoodsService extends IService { /** * 更新商品数量 * - * @param id 商品id - * @param quantity 库存数量 最终值 - * @param totalExchangeCount 累计兑换数量 最终值 + * @param id 商品id + * @param quantity 库存数量 最终值 + * @param totalExchangeCount 累计兑换数量 最终值 */ boolean upNumberById(Long id, Integer quantity, Integer totalExchangeCount); } diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkPointsGoodsMapper.java b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkPointsGoodsMapper.java index 790ffbb61..df4d314d6 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkPointsGoodsMapper.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/mapper/MkPointsGoodsMapper.java @@ -13,5 +13,5 @@ import java.util.List; */ public interface MkPointsGoodsMapper extends BaseMapper { - List getPointsGoodsPageByUser(Long shopId, Long userId); + List getPointsGoodsPageByUser(Long shopId, Long userId,String goodsCategory); } 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 ff4091eb2..6b15d4587 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 @@ -57,9 +57,9 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, Long userId) { + public Page getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId) { PageHelper.startPage(page, size); - List list = mapper.getPointsGoodsPageByUser(shopId, userId); + List list = mapper.getPointsGoodsPageByUser(shopId, userId,goodsCategory); return PageUtil.convert(new PageInfo<>(list)); } diff --git a/cash-service/market-service/src/main/resources/mapper/MkPointsGoodsMapper.xml b/cash-service/market-service/src/main/resources/mapper/MkPointsGoodsMapper.xml index 64118b14a..6739ea892 100644 --- a/cash-service/market-service/src/main/resources/mapper/MkPointsGoodsMapper.xml +++ b/cash-service/market-service/src/main/resources/mapper/MkPointsGoodsMapper.xml @@ -12,6 +12,9 @@ where goods.shop_id = #{shopId} and goods.del_flag = 0 and goods.status = 1 + + and goods.goods_category = #{goodsCategory} + order by goods.sort desc, goods.id desc