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 246306279..f7d2d8056 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 @@ -35,8 +35,8 @@ public class UPointGoodsController { /** * 商品列表 * { - * "pointsGoods": 商品信息, - * "pointsUser": 用户积分信息 + * "pointsGoods": 商品信息, + * "pointsUser": 用户积分信息 * } */ @GetMapping("/page") @@ -82,8 +82,9 @@ public class UPointGoodsController { @GetMapping("/record/page") public CzgResult> getGoodsRecordPage(@RequestParam(defaultValue = "1", required = false) int page, @RequestParam(defaultValue = "10", required = false) int size, + @RequestParam(required = false) String status, @RequestParam Long shopId) { - Page pages = pointsGoodsService.getGoodsRecordPage(page, size, shopId, StpKit.USER.getLoginIdAsLong()); + Page pages = pointsGoodsService.getGoodsRecordPage(page, size, shopId, status, StpKit.USER.getLoginIdAsLong()); return CzgResult.success(pages); } } \ No newline at end of file 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 84c349335..aed9f65ce 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 @@ -21,7 +21,7 @@ public interface MkPointsGoodsService extends IService { Map getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId); - Page getGoodsRecordPage(Integer page, Integer size, Long shopId, Long userId); + Page getGoodsRecordPage(Integer page, Integer size, Long shopId, String status, Long userId); //用户申请退款 boolean applyRefund(PointGoodsRefundDTO param, Long userId); 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 6bc1df730..b5c6ae02b 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 @@ -8,6 +8,7 @@ import com.czg.market.service.MkPointsGoodsRecordService; import com.czg.market.service.MkPointsUserService; import com.czg.market.service.ShopCouponService; import com.czg.order.dto.PointGoodsRefundDTO; +import com.czg.utils.CzgStrUtils; import com.czg.utils.PageUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -81,8 +82,12 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl getGoodsRecordPage(Integer page, Integer size, Long shopId, Long userId) { - return goodsRecordService.page(Page.of(page, size), query().eq(MkPointsGoodsRecord::getUserId, userId).eq(MkPointsGoodsRecord::getShopId, shopId)); + public Page getGoodsRecordPage(Integer page, Integer size, Long shopId, String status, Long userId) { + return goodsRecordService.page(Page.of(page, size), query() + .eq(MkPointsGoodsRecord::getStatus, CzgStrUtils.getStrOrNull(status)) + .eq(MkPointsGoodsRecord::getUserId, userId) + .eq(MkPointsGoodsRecord::getShopId, shopId) + ); } @Override