fix 订单复购

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsAddBo.java

@@ -74,4 +74,7 @@ public class OrderGoodsAddBo {
     /** 0 非复购 1复购 针对业务层次配了【下单前需要  选择班级 */
     @ApiModelProperty("0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
     private Integer rebuy;
+    /** 学习次数 */
+    @ApiModelProperty("学习次数")
+    private Long studyCount;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderGoodsEditBo.java

@@ -94,4 +94,8 @@ public class OrderGoodsEditBo {
     /** 0 非复购 1复购 针对业务层次配了【下单前需要  选择班级 */
     @ApiModelProperty("0 非复购 1复购 针对业务层次配了【下单前需要  选择班级")
     private Integer rebuy;
+
+    /** 学习次数 */
+    @ApiModelProperty("学习次数")
+    private Long studyCount;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderGoods.java

@@ -75,4 +75,6 @@ private static final long serialVersionUID=1L;
     private Long gradeId;
     /** 0 非复购 1复购 针对业务层次配了【下单前需要  选择班级 */
     private Integer rebuy;
+    /** 学习次数 */
+    private Long studyCount;
 }

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

@@ -229,7 +229,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             orderGoods.setCompany(bo.getOrderStudent().getCompany());
             //成交价
             orderGoods.setGoodsRealPrice(goods.getStandPrice());
-
+            orderGoods.setStudyCount(goods.getStudyCount());
             orderGoods.setCreateTime(DateUtils.getNowTime());
             orderGoods.setUpdateTime(DateUtils.getNowTime());
 
@@ -323,6 +323,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             //成交价
             orderGoods.setGoodsRealPrice(goods.getStandPrice());
             orderGoods.setGoodsPrice(goods.getStandPrice());
+            orderGoods.setStudyCount(goods.getStudyCount());
             orderGoods.setCreateTime(DateUtils.getNowTime());
             orderGoods.setUpdateTime(DateUtils.getNowTime());
             //订单价格不计算优惠

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

@@ -130,4 +130,8 @@ public class OrderGoodsVo {
 	private Integer rebuy;
 	@ApiModelProperty("班级名称")
 	private String gradeName;
+	/** 学习次数 */
+	@Excel(name = "学习次数")
+	@ApiModelProperty("学习次数")
+	private Long studyCount;
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeMapper.xml

@@ -305,7 +305,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cgu.learn_status,
         (SELECT COUNT(m.id) FROM course_menu_exam m LEFT JOIN goods_course c on m.course_id=c.course_id LEFT JOIN class_grade_goods cgg on cgg.goods_id = c.goods_id where cg.grade_id=cgg.grade_id and m.type = 1 ) as exam_num,
         (SELECT COUNT(DISTINCT ubr.exam_id) FROM user_bank_record ubr LEFT JOIN class_grade_goods cgg on cgg.goods_id = ubr.goods_id where ubr.`status`=1 and ubr.user_id = u.user_id and ubr.grade_id = cgu.grade_id and ubr.report_status=1) as record_num,
-        (g.study_count-1) as study_count,
+        (og.study_count-1) as study_count,
         og.order_goods_id,
         og.rebuy
         FROM
@@ -330,10 +330,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND (SELECT COUNT(cgde.grade_id) FROM class_grade cgde where cgde.grade_id = cg.grade_id and (unix_timestamp(now()) < cgde.class_end_time or cgde.class_start_time is null)) =0
         </if>
         <if test="studyCountMore != null and studyCountMore == 1 ">
-            AND g.study_count > 1
+            AND og.study_count > 1
         </if>
         <if test="studyCountMore != null and studyCountMore == 0 ">
-            AND g.study_count = 1
+            AND og.study_count = 1
         </if>
         order by cgu.create_time desc
     </select>

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

@@ -26,6 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="remark" column="remark"/>
         <result property="gradeId" column="grade_id"/>
         <result property="rebuy" column="rebuy"/>
+        <result property="studyCount" column="study_count"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.order.vo.OrderGoodsVo" id="OrderGoodsResultVo">
@@ -60,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="gradeId" column="grade_id"/>
         <result property="coverUrl" column="cover_url"/>
         <result property="gradeName" column="class_name"/>
+        <result property="studyCount" column="study_count"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultMap="OrderGoodsResultVo">