fix 订单复购

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

@@ -1,6 +1,7 @@
 package com.zhongzheng.modules.order.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
@@ -229,7 +230,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());
 
@@ -241,6 +242,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             boolean canRepeatBuy = false;
             //视频商品安排班级
             if(goods.getGoodsType()==1){
+                if(Validator.isNotEmpty(goods.getStudyCount())){
+                    orderGoods.setStudyCount(goods.getStudyCount()-1); //默认消耗一次学习机会
+                }else{
+                    orderGoods.setStudyCount(0L);//没配置则为0
+                }
+
                 Long gradeId = null;
                 //判断是否购买历史班级都过期
                 canRepeatBuy =this.canBuyRepeatGoods(g.getGoodsId(),bo.getUserId());
@@ -323,7 +330,6 @@ 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());
             //订单价格不计算优惠
@@ -335,6 +341,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             boolean canRepeatBuy = false;
             //视频商品安排班级
             if(goods.getGoodsType()==1){
+                if(Validator.isNotEmpty(goods.getStudyCount())){
+                    orderGoods.setStudyCount(goods.getStudyCount()-1); //默认分班消耗一次学习机会
+                }else{
+                    orderGoods.setStudyCount(0L);//没配置则为0
+                }
                 Long gradeId = null;
                 //判断是否购买历史班级都过期
                 canRepeatBuy =this.canBuyRepeatGoods(g.getGoodsId(),bo.getUserId());

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,
-        (og.study_count-1) as study_count,
+        (og.study_count) as study_count,
         og.order_goods_id,
         og.rebuy
         FROM