submit

zhongzheng-system/src/main/resources/mapper/modules/exam/ExamApplyMapper.xml

@@ -231,7 +231,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by ea.create_time desc
     </select>
 
-    <select id="countGradePeriod" parameterType="long" resultType="integer">
+    <select id="countGradePeriod" parameterType="com.zhongzheng.modules.exam.bo.ExamApplyQueryBo" resultType="integer">
         SELECT
             COUNT(cg.grade_id)
         FROM
@@ -241,6 +241,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             1 = 1
           AND cgu.user_id = #{userId}
           and cgu.grade_id = #{gradeId}
+          and cgu.order_goods_id = #{orderGoodsId}
           AND cgu.period_status = 1
           and cg.`status` =1
           and cgu.`status` =1

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

@@ -296,7 +296,7 @@
                  LEFT JOIN goods g ON og.goods_id = g.goods_id
                  LEFT JOIN class_grade cg ON og.grade_id = cg.grade_id
                  LEFT JOIN `order` o on og.order_sn = o.order_sn
-                 LEFT JOIN class_grade_user cgu ON cgu.grade_id = cg.grade_id and cgu.user_id = #{userId}
+                 LEFT JOIN class_grade_user cgu ON cgu.grade_id = cg.grade_id and cgu.order_goods_id = og.order_goods_id and cgu.user_id = #{userId}
         WHERE o.user_id = #{userId}
           and og.goods_id = #{goodsId}
           and og.pay_status in (2, 3, 4)

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

@@ -237,7 +237,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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
+        LEFT JOIN class_grade_user cgu on cgu.grade_id = og2.grade_id and cgu.user_id = o.user_id and cgu.order_goods_id = og.order_goods_id
         WHERE 1=1
         AND og.rebuy_order_goods_id >0
         AND cgu.period_plush = 1
@@ -424,7 +424,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN order_goods og ON o.order_sn = og.order_sn
                 LEFT JOIN goods g ON og.goods_id = g.goods_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
+                LEFT JOIN class_grade_user cgu on cgu.grade_id = og2.grade_id and cgu.user_id = o.user_id and cgu.order_goods_id = og.order_goods_id
         WHERE 1=1
           AND og.pay_status IN ( 2, 3, 4 )
           AND og.rebuy_order_goods_id >0