Browse Source

缴费项目改造

zouxuan 2 years ago
parent
commit
72c87757e7

+ 8 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleStudentPaymentServiceImpl.java

@@ -516,7 +516,14 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 					detail.setSubCourseOriginalPrice(detail.getSubCourseCurrentPrice().subtract(expectPrice));
 					courseMinutes = 0;
 				}
-				if(MusicGroupPaymentCalender.PayUserType.SCHOOL.equals(calenderMap.get(detail.getMusicGroupPaymentCalenderId()).get(0).getPayUserType())){
+				MusicGroupPaymentCalender calender = calenderMap.get(detail.getMusicGroupPaymentCalenderId()).get(0);
+				if(StringUtils.isEmpty(studentPayment.getBatchNo())){
+					studentPayment.setBatchNo(calender.getBatchNo());
+				}else {
+					studentPayment.setBatchNo(studentPayment.getBatchNo() + "," + calender.getBatchNo());
+				}
+
+				if(MusicGroupPaymentCalender.PayUserType.SCHOOL.equals(calender.getPayUserType())){
 					studentPayment.setExpectPrice(BigDecimal.ZERO);
 				}
 				if(courseMinutes == 0){

+ 2 - 2
mec-biz/src/main/resources/config/mybatis/MusicGroupPaymentStudentCourseDetailMapper.xml

@@ -84,8 +84,8 @@
             <if test="subCourseOriginalPrice != null">
                 sub_course_original_price_ = #{subCourseOriginalPrice},
             </if>
-            <if test="subCcourseCurrentPrice != null">
-                sub_course_current_price_ = #{subCcourseCurrentPrice},
+            <if test="subCourseCurrentPrice != null">
+                sub_course_current_price_ = #{subCourseCurrentPrice},
             </if>
             <if test="subCourseMinutes != null">
                 sub_course_minutes_ = #{subCourseMinutes},