fix 录单

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

@@ -291,6 +291,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             payPrice = payPrice.add(g.getGoodsPrice());
             boolean orderGoodsRs = iOrderGoodsService.save(orderGoods);
             boolean canRepeatBuy = false;
+            validUserBeforeBuy(goods,bo.getUserId());
             //视频商品安排班级
             if (goods.getGoodsType() == 1) {
                 if (Validator.isNotEmpty(goods.getStudyCount())) {
@@ -329,7 +330,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (!canRepeatBuy && goods.getGoodsType() != 3 && goods.getGoodsType() != 4) {
                 this.checkBuyGoods(g.getGoodsId(), bo.getUserId(), goods.getGoodsType());
             }
-            validUserBeforeBuy(goods,bo.getUserId());
             //商品0元加入免费商品列表
             if (orderGoods.getGoodsPrice().compareTo(BigDecimal.ZERO) == 0) {
                 freeList.add(orderGoods);
@@ -423,6 +423,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             receivedPrice = receivedPrice.add(g.getGoodsReceived());
             boolean orderGoodsRs = iOrderGoodsService.save(orderGoods);
             boolean canRepeatBuy = false;
+            validUserBeforeBuy(goods,bo.getUserId());
             //视频商品安排班级
             if (goods.getGoodsType() == 1) {
                 if (Validator.isNotEmpty(goods.getStudyCount())) {
@@ -461,7 +462,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (!canRepeatBuy && goods.getGoodsType() != 3 && goods.getGoodsType() != 4) {
                 this.checkBuyGoods(g.getGoodsId(), bo.getUserId(), goods.getGoodsType());
             }
-            validUserBeforeBuy(goods,bo.getUserId());
             //商品0元或已收费加入收费商品列表
             if (g.getGoodsRealPrice().compareTo(BigDecimal.ZERO) == 0) {
                 //免费的
@@ -600,6 +600,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             boolean orderGoodsRs = iOrderGoodsService.save(orderGoods);
 
             boolean canRepeatBuy = false;
+            validUserBeforeBuy(goods,bo.getUserId());
             //视频商品安排班级
             if (goods.getGoodsType() == 1) {
                 if (Validator.isNotEmpty(goods.getStudyCount())) {
@@ -633,7 +634,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (!canRepeatBuy && goods.getGoodsType() != 3 && goods.getGoodsType() != 4) {
                 this.checkBuyGoods(g.getGoodsId(), bo.getUserId(), goods.getGoodsType());
             }
-            validUserBeforeBuy(goods,bo.getUserId());
             iShoppingCartService.deleteByGoodsId(g.getGoodsId(), bo.getUserId());
             //商品0元加入免费商品列表
             if (orderGoods.getGoodsPrice().compareTo(BigDecimal.ZERO) == 0) {
@@ -743,6 +743,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             boolean orderGoodsRs = iOrderGoodsService.save(orderGoods);
 
             boolean canRepeatBuy = false;
+            validUserBeforeBuy(goods,bo.getUserId());
             //视频商品安排班级
             if (goods.getGoodsType() == 1) {
                 if (Validator.isNotEmpty(goods.getStudyCount())) {
@@ -776,7 +777,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
             if (!canRepeatBuy && goods.getGoodsType() != 3 && goods.getGoodsType() != 4) {
                 this.checkBuyGoods(g.getGoodsId(), bo.getUserId(), goods.getGoodsType());
             }
-            validUserBeforeBuy(goods,bo.getUserId());
             iShoppingCartService.deleteByGoodsId(g.getGoodsId(), bo.getUserId());
             //商品0元加入免费商品列表
             if (orderGoods.getGoodsPrice().compareTo(BigDecimal.ZERO) == 0) {

zhongzheng-system/src/main/resources/mapper/modules/bank/QuestionMapper.xml

@@ -288,6 +288,9 @@
           AND og.`status` =1
           and og.pay_status in (2,3,4)
           AND og.refund_status in (0,3,1)
+        <if test="educationTypeId != null and educationTypeId != ''">
+            AND g.education_type_id = #{educationTypeId}
+        </if>
         ORDER BY og.create_time DESC
     </select>
 </mapper>

zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -507,6 +507,9 @@
         <if test="userId != null and userId != ''">
             and o.user_id = #{userId}
         </if>
+        <if test="educationTypeId != null and educationTypeId != ''">
+            AND g.education_type_id = #{educationTypeId}
+        </if>
         order by o.create_time desc
     </select>
     <select id="courseList" parameterType="com.zhongzheng.modules.course.bo.CourseQueryBo"  resultMap="CourseUserVo">

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsMapper.xml

@@ -262,8 +262,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="goodsType ==1">
             , (SELECT count(*) FROM goods_course where goods_id =g.goods_id ) as course_num
             , (SELECT count(*) FROM class_grade cg  LEFT JOIN class_grade_goods cgg on cg.grade_id = cgg.grade_id where  cgg.goods_id = g.goods_id and cg.`status` = 1 ) as grade_num
-            , (SELECT cg.grade_id FROM class_grade cg  LEFT JOIN class_grade_goods cgg on cg.grade_id = cgg.grade_id where  cgg.goods_id = g.goods_id and cg.`status` = 1 limit 1) as grade_id
-            , (SELECT cg.class_name FROM class_grade cg  LEFT JOIN class_grade_goods cgg on cg.grade_id = cgg.grade_id where  cgg.goods_id = g.goods_id and cg.`status` = 1 limit 1) as grade_name
+            , (SELECT cg.grade_id FROM class_grade cg  LEFT JOIN class_grade_goods cgg on cg.grade_id = cgg.grade_id where  cgg.goods_id = g.goods_id and cg.`status` = 1 AND (unix_timestamp(now()) &lt; cg.class_end_time or cg.class_start_time is null) AND cg.`status` = 1  AND (SELECT COUNT(a.id) FROM class_grade_user a where a.grade_id = cg.grade_id and a.status =1) &lt; cg.student_upper limit 1) as grade_id
+            , (SELECT cg.class_name FROM class_grade cg  LEFT JOIN class_grade_goods cgg on cg.grade_id = cgg.grade_id where  cgg.goods_id = g.goods_id and cg.`status` = 1 AND (unix_timestamp(now()) &lt; cg.class_end_time or cg.class_start_time is null) AND cg.`status` = 1  AND (SELECT COUNT(a.id) FROM class_grade_user a where a.grade_id = cg.grade_id and a.status =1) &lt; cg.student_upper limit 1) as grade_name
         </if>
         FROM
         goods g