czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

兑换记录的状态筛选

Browse Source
This commit is contained in:
wangw
2025-12-11 09:23:30 +08:00
parent f74d0070cf
commit 391cb04c98
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cash-api/order-server/src/main/java/com/czg/controller/user/UPointGoodsController.java
View File

@@ -82,8 +82,9 @@ public class UPointGoodsController {
@GetMapping("/record/page")
public CzgResult<Page<MkPointsGoodsRecord>> getGoodsRecordPage(@RequestParam(defaultValue = "1", required = false) int page,
@RequestParam(defaultValue = "10", required = false) int size,
@RequestParam(required = false) String status,
@RequestParam Long shopId) {
Page<MkPointsGoodsRecord> pages = pointsGoodsService.getGoodsRecordPage(page, size, shopId, StpKit.USER.getLoginIdAsLong());
Page<MkPointsGoodsRecord> pages = pointsGoodsService.getGoodsRecordPage(page, size, shopId, status, StpKit.USER.getLoginIdAsLong());
return CzgResult.success(pages);
}
}

2
cash-common/cash-common-service/src/main/java/com/czg/market/service/MkPointsGoodsService.java
View File

@@ -21,7 +21,7 @@ public interface MkPointsGoodsService extends IService<MkPointsGoods> {
Map<String, Object> getPointsGoodsPageByUser(Integer page, Integer size, Long shopId, String goodsCategory, Long userId);
Page<MkPointsGoodsRecord> getGoodsRecordPage(Integer page, Integer size, Long shopId, Long userId);
Page<MkPointsGoodsRecord> getGoodsRecordPage(Integer page, Integer size, Long shopId, String status, Long userId);
//用户申请退款
boolean applyRefund(PointGoodsRefundDTO param, Long userId);

9
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkPointsGoodsServiceImpl.java
View File

@@ -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<MkPointsGoodsMapper, M
}
@Override
public Page<MkPointsGoodsRecord> 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<MkPointsGoodsRecord> 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