From 0e6c8463c32099a300b94567f2656bb363acd502 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 17 十月 2023 10:53:20 +0800 Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev --- server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java | 2 ++ 1 files changed, 2 insertions(+), 0 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 4713dbc..eeacdc4 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 @@ -216,6 +216,8 @@ queryWrapper.like(model.getOnlineOrderid() !=null,Goodsorder::getOnlineOrderid,model.getOnlineOrderid()); queryWrapper.like(model.getOpenid() !=null,Member::getOpenid,model.getOpenid()); queryWrapper.eq(Goodsorder::getIsdeleted,Constants.ZERO); + queryWrapper.eq(Goodsorder::getStatus,Constants.ONE); + queryWrapper.eq(Goodsorder::getPayStatus,Constants.ONE); queryWrapper.orderByDesc(Goodsorder::getPayDate); return queryWrapper; } -- Gitblit v1.9.3