复购冲突列表

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderController.java

@@ -66,6 +66,17 @@ public class OrderController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询订单列表
+     */
+    @ApiOperation("查询复购冲突订单列表")
+    @GetMapping("/rebuyList")
+    public TableDataInfo<OrderListVo> rebuyList(OrderQueryBo bo) {
+        startPage();
+        List<OrderListVo> list = iOrderService.selectRebuyList(bo);
+        return getDataTable(list);
+    }
+
     /**
      * 查询订单商品列表
      */

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderService.java

@@ -35,6 +35,8 @@ public interface IOrderService extends IService<Order> {
 
 	List<OrderListVo> selectList(OrderQueryBo bo);
 
+	List<OrderListVo> selectRebuyList(OrderQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入订单
 	 * @param bo 订单新增业务对象

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -164,6 +164,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
         return orderListVos;
     }
 
+    @Override
+    public List<OrderListVo> selectRebuyList(OrderQueryBo bo) {
+        return baseMapper.selectRebuyList(bo);
+    }
+
     /**
      * 实体类转化成视图对象
      *

zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -219,7 +219,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         og.goods_received,
         og.refund_status,
         og.pay_status as goods_pay_status,
-        (select cgu.period_plush from  class_grade_user cgu where cgu.grade_id = og.grade_id and cgu.user_id = o.user_id limit 1 ) period_plush,
+        cgu.period_plush,
         (SELECT oi.invoice_status FROM order_invoice oi LEFT JOIN order_invoice_order oio ON oio.invoice_id = oi.invoice_id WHERE
         oio.order_goods_id = og.order_goods_id AND oi.period_status != 2 limit 1) invoice_status
         FROM
@@ -232,8 +232,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN course_business cb ON g.business_id = cb.id
         LEFT JOIN school s ON s.id = g.school_id
         LEFT JOIN major m ON g.major_id = m.id
+        LEFT JOIN order_goods og2 ON og.rebuy_order_goods_id = og2.order_goods_id
+        LEFT JOIN class_grade_user cgu on cgu.grade_id = og2.grade_id and cgu.user_id = o.user_id
         WHERE 1=1
-
+        AND og.rebuy_order_goods_id >0
+        AND cgu.period_plush = 1
         <if test="educationTypeId != null and educationTypeId != ''">
             AND g.education_type_id = #{educationTypeId}
         </if>
@@ -276,9 +279,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="refundStatus != null">
             AND og.refund_status = #{refundStatus}
         </if>
-        <if test="goodsType != null">
-            AND g.goods_type = #{goodsType}
-        </if>
+        AND g.goods_type = 1
         <if test="userId != null">
             AND u.user_id = #{userId}
             AND og.pay_status in (2,3,4)