订单列表添加vip订单、名医精彩订单类型

src/main/java/com/peanut/modules/book/service/impl/BuyOrderServiceImpl.java

@@ -356,7 +356,14 @@ public class BuyOrderServiceImpl extends ServiceImpl<BuyOrderDao, BuyOrder> 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);

src/main/java/com/peanut/modules/book/vo/request/BuyOrderListRequestVo.java

@@ -47,6 +47,10 @@ public class BuyOrderListRequestVo {
      * 订单状态
      */
     private String orderStatus;
+    /**
+     * 订单类型
+     */
+    private String orderType;
     /**
      * 数据起始位置
      */