From 9d9e3e3f45406bb1a08981b159b50deb0d102e57 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 20 十二月 2023 10:58:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devPartner' into devPartner
---
server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 4b18e96..eeef052 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -247,6 +247,7 @@
List<GoodsorderExportVO> goodsorderList = null;
if(Constants.formatIntegerNum(model.getType())==Constants.ZERO){
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(model);
+ queryWrapper.orderByAsc(Goodsorder::getPayDate);
goodsorderList = goodsorderJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
}else{
@@ -270,7 +271,7 @@
queryWrapper.le( Refund::getDoneDate, Utils.Date.getEnd(model.getEndDate()));
}
queryWrapper.eq(Refund::getStatus,Constants.TWO);//閫�娆惧畬鎴�
- queryWrapper.orderByAsc(Refund::getDoneDate);
+ queryWrapper.orderByAsc(Refund::getDoneDate);;
goodsorderList = refundJoinMapper.selectJoinList(GoodsorderExportVO.class,queryWrapper);
}
if (!CollectionUtils.isEmpty(goodsorderList)){
@@ -306,7 +307,7 @@
queryWrapper.like(model.getOpenid() !=null,Member::getOpenid,model.getOpenid());
queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO);
queryWrapper.eq(Goodsorder::getPayStatus,Constants.ONE);
- queryWrapper.orderByDesc(Goodsorder::getPayDate);
+
return queryWrapper;
}
@@ -315,6 +316,7 @@
public PageData<Goodsorder> findPage(PageWrap<Goodsorder> pageWrap) {
IPage<Goodsorder> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<Goodsorder> queryWrapper = initQueryParamByModel(pageWrap.getModel());
+ queryWrapper.orderByDesc(Goodsorder::getPayDate);
queryWrapper.select("(select er.status from member_rides er where er.ordre_id=t.id order by er.create_date desc limit 1) as memberRidesStatus");
if(Objects.nonNull(pageWrap.getModel().getCloseStatus()) && pageWrap.getModel().getCloseStatus().equals(Constants.ZERO)){
queryWrapper.ne(Goodsorder::getStatus,Constants.GOODSORDER_STATUS.CLOSE.getKey());
--
Gitblit v1.9.3