1、财务列表，创建订单后，审核拒绝，再修改，修改后数据没变

2、创建学校缴费，不管现价输入多少，提交后现价都变成了0

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

@@ -297,27 +297,25 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				.add(activityOriginalAmount)
 				.add(repairOriginalAmount).setScale(0, BigDecimal.ROUND_HALF_UP);
 
-		BigDecimal actualTotalAmount = BigDecimal.ZERO;
+		//计算缴费项目总金额(前端录入)
+		BigDecimal courseActualAmount = musicGroupPaymentCalenderCourseSettingsService.getActualAmount(musicGroupPaymentBaseCalender);
+		BigDecimal memberActualAmount = musicGroupPaymentCalenderMemberService.getActualAmount(musicGroupPaymentBaseCalender);
+		BigDecimal repairActualAmount = musicGroupPaymentCalenderRepairService.getActualAmount(musicGroupPaymentBaseCalender);
+		BigDecimal activityActualAmount = musicGroupPaymentCalenderActivityService.getActualAmount(musicGroupPaymentBaseCalender);
+
+		BigDecimal actualTotalAmount = courseActualAmount.add(memberActualAmount)
+				.add(repairActualAmount)
+				.add(activityActualAmount).setScale(0, BigDecimal.ROUND_HALF_UP);
+
 		PaymentCalenderStatusEnum status;
 		if (musicGroupPaymentBaseCalender.getPayUserType() == SCHOOL) {
 			status = AUDITING;
 		} else {
-			//计算缴费项目总金额(前端录入)
-			BigDecimal courseActualAmount = musicGroupPaymentCalenderCourseSettingsService.getActualAmount(musicGroupPaymentBaseCalender);
-			BigDecimal memberActualAmount = musicGroupPaymentCalenderMemberService.getActualAmount(musicGroupPaymentBaseCalender);
-			BigDecimal repairActualAmount = musicGroupPaymentCalenderRepairService.getActualAmount(musicGroupPaymentBaseCalender);
-			BigDecimal activityActualAmount = musicGroupPaymentCalenderActivityService.getActualAmount(musicGroupPaymentBaseCalender);
-
-			actualTotalAmount = courseActualAmount.add(memberActualAmount)
-					.add(repairActualAmount)
-					.add(activityActualAmount).setScale(0, BigDecimal.ROUND_HALF_UP);
-
 			//计算项目原现价
 			BigDecimal courseCurrentAmount = musicGroupPaymentCalenderCourseSettingsService.getCurrentAmount(musicGroupPaymentBaseCalender);
 			BigDecimal memberCurrentAmount = musicGroupPaymentCalenderMemberService.getCurrentAmount(musicGroupPaymentBaseCalender);
 			BigDecimal repairCurrentAmount = musicGroupPaymentCalenderRepairService.getCurrentAmount(musicGroupPaymentBaseCalender);
 			BigDecimal activityCurrentAmount = musicGroupPaymentCalenderActivityService.getCurrentAmount(musicGroupPaymentBaseCalender);
-
 			BigDecimal currentTotalAmount = courseCurrentAmount.add(memberCurrentAmount)
 					.add(repairCurrentAmount)
 					.add(activityCurrentAmount).setScale(0, BigDecimal.ROUND_HALF_UP);

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

@@ -126,12 +126,7 @@
             <if test="auditComment != null">
                 audit_comment_ = #{auditComment},
             </if>
-            <if test="calenderId != null">
                 calender_id_ = #{calenderId},
-            </if>
-            <if test="createTime != null">
-                create_time_ = #{createTime},
-            </if>
             <if test="updateTime != null">
                 update_time_ = #{updateTime},
             </if>