merge

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

@@ -1666,7 +1666,7 @@
                 AND og.`status` = 1
                 AND og.refund_status != 2
 	            AND og.pay_status IN ( 2, 3, 4 )
-	            AND cgu.period_status = -1
+	            AND cgu.period_status != 1
 	            AND cgu.finish_status = 0
 	            AND (
 	            SELECT

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

@@ -204,7 +204,7 @@
         LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
         LEFT JOIN course_business cb ON g.business_id = cb.id
         LEFT JOIN `order` o ON og.order_sn = o.order_sn
-        LEFT JOIN class_grade_user cgu on cgu.user_id = o.user_id and cgu.grade_id = cg.grade_id
+        LEFT JOIN class_grade_user cgu on cgu.user_id = o.user_id and cgu.grade_id = cg.grade_id and cgu.order_goods_id = og.order_goods_id
         WHERE
         1=1
         <if test="orderSn != null and orderSn != ''">