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 9a82b2ace..ce68cbf8b 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 @@ -89,16 +89,21 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl { wrapper.eq(MkPointsGoodsRecord::getStatus, "退款中").or(MkPointsGoodsRecord::getStatus).eq("已退款"); }); + queryWrapper.orderBy(MkPointsGoodsRecord::getStatus, false); } else { queryWrapper.eq(MkPointsGoodsRecord::getStatus, status); + queryWrapper.orderBy(MkPointsGoodsRecord::getStatus, false); + queryWrapper.orderBy(MkPointsGoodsRecord::getCreateTime, false); } + } else { + queryWrapper.orderBy(MkPointsGoodsRecord::getCreateTime, false); } Page pages = goodsRecordService.page(Page.of(page, size), queryWrapper); pages.getRecords().forEach(MkPointsGoodsRecord::fillCouponInfo);