Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/VipGroupServiceImpl.java

@@ -1377,9 +1377,9 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			classGroup.setStudentNum(classGroup.getStudentNum()+num);
 		}
 
-//		Integer studentPaymentNum=studentPaymentOrderDao.countStudentPaymentNum(vipGroupId.toString());
+		Integer studentPaymentNum=studentPaymentOrderDao.countStudentPaymentNum(vipGroupId.toString());
 
-		Integer studentPaymentNum = classGroupStudentMapperDao.countClassGroupStudentNum(classGroup.getId());
+//		Integer studentPaymentNum = classGroupStudentMapperDao.countClassGroupStudentNum(classGroup.getId());
 
 		if(studentPaymentNum.equals(classGroup.getExpectStudentNum())&&updateVipStatus){
 			classGroup.setStudentNum(studentPaymentNum);

mec-biz/src/main/resources/config/mybatis/CourseScheduleStudentPaymentMapper.xml

@@ -717,13 +717,15 @@
 			cgtm.user_id_ 'value'
 		FROM
 			course_schedule_student_payment cssp
-				LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
-				LEFT JOIN class_group_teacher_mapper cgtm ON cssp.class_group_id_ = cgtm.class_group_id_
+			LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
+			LEFT JOIN class_group_teacher_mapper cgtm ON cssp.class_group_id_ = cgtm.class_group_id_
+			LEFT JOIN class_group_student_mapper cgsm ON cssp.class_group_id_=cgsm.class_group_id_ AND cssp.user_id_=cgsm.user_id_
 		WHERE
 			( cs.del_flag_ IS NULL OR cs.del_flag_ = 0 )
 			AND ( cs.new_course_id_ IS NULL OR cs.new_course_id_ = cs.id_ )
 			AND cs.type_ IN ( 'SINGLE', 'TRAINING_SINGLE' )
 			AND cgtm.teacher_role_ = 'BISHOP'
+			AND cgsm.status_='NORMAL'
 			<if test="musicGroupId!=null and musicGroupId!=''">
 				AND cssp.music_group_id_ = #{musicGroupId}
 			</if>

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -416,7 +416,7 @@
         <![CDATA[ AND create_time_ <= ]]> #{beforeTime}
     </select>
     <select id="countStudentPaymentNum" resultType="int">
-        select count(1)
+        select count(DISTINCT user_id_)
         from student_payment_order
         where music_group_id_ = #{musicGroupId}
           AND status_ = 'SUCCESS'

mec-student/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -324,7 +324,7 @@ public class StudentOrderController extends BaseController {
 
     //    @Scheduled(cron = "0/30 * * * * ?")
     @GetMapping("/setSuccessStatus")
-    public HttpResponseResult setSuccessStatus() throws Exception {
+    public HttpResponseResult setSuccessStatus(String orderNo) throws Exception {
 //        if (!profiles.equals("dev")) {
 //            return failed("非法操作");
 //        }
@@ -332,6 +332,9 @@ public class StudentOrderController extends BaseController {
 
         String[] statusArr = {"0", "1", "7"};
         for (StudentPaymentOrder payingOrder : payingOrders) {
+            if(StringUtils.isNotBlank(orderNo)&&!orderNo.equals(payingOrder.getOrderNo())){
+                continue;
+            }
             Map<String, String> rpMap = new HashMap<>();
             rpMap.put("tradeState", "1");
             rpMap.put("remarks", "模拟支付成功");