From 20c92de159dd4ee8c359d3e5056547fc0250c80b Mon Sep 17 00:00:00 2001 From: wuchunlei Date: Fri, 27 Jun 2025 16:07:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0vip=E8=AE=A2=E5=8D=95=E3=80=81=E5=90=8D=E5=8C=BB?= =?UTF-8?q?=E7=B2=BE=E5=BD=A9=E8=AE=A2=E5=8D=95=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/book/service/impl/BuyOrderServiceImpl.java | 9 ++++++++- .../modules/book/vo/request/BuyOrderListRequestVo.java | 4 ++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java index df055292..47e86179 100644 --- a/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java +++ b/src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java @@ -356,7 +356,14 @@ public class BuyOrderServiceImpl extends ServiceImpl impl wrapper.selectAll(BuyOrder.class); wrapper.leftJoin(MyUserEntity.class, MyUserEntity::getId,BuyOrder::getUserId); wrapper.eq(StringUtils.isNotBlank(requestVo.getOrderStatus()),BuyOrder::getOrderStatus,requestVo.getOrderStatus()); - wrapper.eq(BuyOrder::getOrderType,"order"); + if ("vip".equals(requestVo.getOrderType())){ + wrapper.eq(BuyOrder::getOrderType,"vip"); + }else if ("mingyijingcai".equals(requestVo.getOrderType())){ + wrapper.eq(BuyOrder::getCome,4); + wrapper.in(BuyOrder::getOrderType,"order","relearn"); + }else { + wrapper.eq(BuyOrder::getOrderType,"order"); + } wrapper.gt(requestVo.getStartTime()!=null,BuyOrder::getCreateTime,requestVo.getStartTime()); wrapper.lt(requestVo.getEndTime()!=null,BuyOrder::getCreateTime,requestVo.getEndTime()); wrapper.orderByDesc(BuyOrder::getCreateTime); diff --git a/src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java b/src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java index 6f6cf207..42a96333 100644 --- a/src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java +++ b/src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java @@ -47,6 +47,10 @@ public class BuyOrderListRequestVo { * 订单状态 */ private String orderStatus; + /** + * 订单类型 + */ + private String orderType; /** * 数据起始位置 */