From 4bb67c03b91ad0be725fffc4a32c5d141429de9d Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Thu, 11 Dec 2025 15:27:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../market/service/impl/MkPointsGoodsServiceImpl.java    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 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 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<MkPointsGoodsMapper, M
         QueryWrapper queryWrapper = query()
                 .eq(MkPointsGoodsRecord::getUserId, userId)
                 .eq(MkPointsGoodsRecord::getShopId, shopId)
-                .eq(MkPointsGoodsRecord::getIsDel, 0)
-                .orderBy(MkPointsGoodsRecord::getCreateTime, false);
+                .eq(MkPointsGoodsRecord::getIsDel, 0);
+
         if (StrUtil.isNotBlank(status)) {
             if ("售后".equals(status)) {
                 queryWrapper.and(wrapper -> {
                     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<MkPointsGoodsRecord> pages = goodsRecordService.page(Page.of(page, size), queryWrapper);
         pages.getRecords().forEach(MkPointsGoodsRecord::fillCouponInfo);