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 15:27:45 +08:00
parent fd055a17bf
commit 4bb67c03b9
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,16 +89,21 @@ public class MkPointsGoodsServiceImpl extends ServiceImpl<MkPointsGoodsMapper, M
QueryWrapper queryWrapper = query() QueryWrapper queryWrapper = query()
.eq(MkPointsGoodsRecord::getUserId, userId) .eq(MkPointsGoodsRecord::getUserId, userId)
.eq(MkPointsGoodsRecord::getShopId, shopId) .eq(MkPointsGoodsRecord::getShopId, shopId)
.eq(MkPointsGoodsRecord::getIsDel, 0) .eq(MkPointsGoodsRecord::getIsDel, 0);
.orderBy(MkPointsGoodsRecord::getCreateTime, false);
if (StrUtil.isNotBlank(status)) { if (StrUtil.isNotBlank(status)) {
if ("售后".equals(status)) { if ("售后".equals(status)) {
queryWrapper.and(wrapper -> { queryWrapper.and(wrapper -> {
wrapper.eq(MkPointsGoodsRecord::getStatus, "退款中").or(MkPointsGoodsRecord::getStatus).eq("已退款"); wrapper.eq(MkPointsGoodsRecord::getStatus, "退款中").or(MkPointsGoodsRecord::getStatus).eq("已退款");
}); });
queryWrapper.orderBy(MkPointsGoodsRecord::getStatus, false);
} else { } else {
queryWrapper.eq(MkPointsGoodsRecord::getStatus, status); 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); Page<MkPointsGoodsRecord> pages = goodsRecordService.page(Page.of(page, size), queryWrapper);
pages.getRecords().forEach(MkPointsGoodsRecord::fillCouponInfo); pages.getRecords().forEach(MkPointsGoodsRecord::fillCouponInfo);