FIX 合并

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderMapper.java

@@ -21,4 +21,6 @@ public interface OrderMapper extends BaseMapper<Order> {
     Integer selectUserClass(@Param("goodsId") Long goodsId,@Param("userId") Long userId);
 
     List<OrderListVo> selectListApp(OrderQueryBo bo);
+
+    Integer getGradePeriod(@Param("orderGoodsId") Long orderGoodsId,@Param("userId") Long userId);
 }

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

@@ -137,7 +137,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 
     @Override
     public List<OrderListVo> selectList(OrderQueryBo bo) {
-        List<OrderListVo> orderListVos = orderMapper.selectList(bo);
+        List<OrderListVo> orderListVos = this.baseMapper.selectList(bo);
+        for(OrderListVo vo : orderListVos){
+            if(Validator.isNotEmpty(vo.getRebuyOrderGoodsId())&&vo.getRebuyOrderGoodsId().longValue()>0){
+                vo.setRebuy(this.baseMapper.getGradePeriod(vo.getRebuyOrderGoodsId(),vo.getUserId()));
+            }
+        }
         return orderListVos;
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderGoodsVo.java

@@ -124,7 +124,7 @@ public class OrderGoodsVo {
 	@Excel(name = "封面地址")
 	@ApiModelProperty("封面地址")
 	private String coverUrl;
-	/** 0 非复购 1复购 针对业务层次配了【下单前需要  选择班级 */
+	/** 复购老订单商品ID */
 	@Excel(name = "复购老订单商品ID")
 	@ApiModelProperty("复购老订单商品ID")
 	private Long rebuyOrderGoodsId;

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderListVo.java

@@ -169,4 +169,7 @@ public class OrderListVo {
 	private Integer rebuy;
 	@ApiModelProperty("是否学时推送 0未推送 1推送")
 	private Integer periodPlush;
+	@Excel(name = "复购老订单商品ID")
+	@ApiModelProperty("复购老订单商品ID")
+	private Long rebuyOrderGoodsId;
 }

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

@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="year" column="year"/>
         <result property="coverUrl" column="cover_url"/>
         <result property="code" column="code"/>
-        <result property="rebuy" column="rebuy"/>
+        <result property="rebuyOrderGoodsId" column="rebuy_order_goods_id"/>
 
         <result property="educationName" column="education_name"/>
         <result property="projectName" column="project_name"/>
@@ -73,6 +73,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="periodPlush" column="period_plush"/>
     </resultMap>
 
+    <select id="getGradePeriod" parameterType="Map" resultType="integer">
+        SELECT
+            cgu.period_plush
+        FROM
+            order_goods og
+                LEFT JOIN class_grade_user cgu ON og.grade_id = cgu.grade_id
+                AND cgu.user_id = #{userId} where og.order_goods_id = #{orderGoodsId}
+    </select>
+
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderQueryBo" resultMap="OrderResultVo">
         SELECT
             o.*,