排序问题
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user