From 52721502d5f0782e3218d2ac8ccf4abde0b8f066 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Thu, 11 Dec 2025 09:46:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=94=AE=E5=90=8E=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MkPointsGoodsServiceImpl.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) 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 7a15304f5..7a9ca3845 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 @@ -13,6 +13,7 @@ import com.czg.utils.PageUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.mybatisflex.core.paginate.Page; +import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; import com.czg.market.service.MkPointsGoodsService; import com.czg.service.market.mapper.MkPointsGoodsMapper; @@ -83,11 +84,20 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl 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)) + QueryWrapper queryWrapper = query() .eq(MkPointsGoodsRecord::getUserId, userId) .eq(MkPointsGoodsRecord::getShopId, shopId) - ); + .orderBy(MkPointsGoodsRecord::getCreateTime, false); + if (status != null) { + if ("售后".equals(status)) { + queryWrapper.and(wrapper -> { + wrapper.eq(MkPointsGoodsRecord::getStatus, "退款中").or(MkPointsGoodsRecord::getStatus).eq("已退款"); + }); + } else { + queryWrapper.eq(MkPointsGoodsRecord::getStatus, status); + } + } + return goodsRecordService.page(Page.of(page, size), queryWrapper); } @Override