经营报表配置项改动

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseScheduleStudentPayment.java

@@ -36,6 +36,12 @@ public class CourseScheduleStudentPayment extends BaseEntity implements Comparab
 	
 	/**  */
 	private java.math.BigDecimal actualPrice = BigDecimal.ZERO;
+
+	/** 经营报表预计价格 */
+	private java.math.BigDecimal expectPriceBak = BigDecimal.ZERO;
+
+	/** 经营报表实际价格 */
+	private java.math.BigDecimal actualPriceBak = BigDecimal.ZERO;
 	
 	/**  */
 	private java.util.Date createTime;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupPaymentCalenderMember.java

@@ -23,6 +23,14 @@ public class MusicGroupPaymentCalenderMember extends MusicGroupPaymentCalenderBa
     @ApiModelProperty(value = "团练宝收入，actualAmount减去收入以及其他费用，剩下的就是课程费用", required = false)
     private BigDecimal income;
 
+    public BigDecimal getIncome() {
+        return income;
+    }
+
+    public void setIncome(BigDecimal income) {
+        this.income = income;
+    }
+
     public Boolean getAutoActivationFlag() {
         return autoActivationFlag;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/StudentRegistration.java

@@ -114,6 +114,8 @@ public class StudentRegistration extends BaseEntity {
 
     private BigDecimal surplusCourseFee;
 
+    private BigDecimal expectSurplusCourseFee;
+
     private String organName;
 
     private String schoolName;
@@ -147,6 +149,14 @@ public class StudentRegistration extends BaseEntity {
     @ApiModelProperty(value = "是否成团学员",required = true)
     private boolean originalFlag;
 
+    public BigDecimal getExpectSurplusCourseFee() {
+        return expectSurplusCourseFee;
+    }
+
+    public void setExpectSurplusCourseFee(BigDecimal expectSurplusCourseFee) {
+        this.expectSurplusCourseFee = expectSurplusCourseFee;
+    }
+
     public boolean isOriginalFlag() {
         return originalFlag;
     }

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

@@ -431,6 +431,12 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
             }, executor);
             executor.shutdown();
         }
+        //如果缴费项目不需要审核，处理经营报表相关改动
+        if(musicGroupPaymentCalender.getStatus() != AUDITING){
+            //更新 student_registration 表 expect_surplus_course_fee_预计总课费
+            //更新 music_group_payment_calender_member 表 income_团练宝实际收入
+            //更新 course_schedule_student_payment 表 经营报表预售、实收
+        }
 
         ModelMap map = new ModelMap(1);
         map.put("musicGroupPaymentCalenderBatchNo", batchNo);

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

@@ -15,6 +15,8 @@
 		<result column="original_price_" property="originalPrice"/>
 		<result column="expect_price_" property="expectPrice" />
 		<result column="actual_price_" property="actualPrice" />
+		<result column="expect_price_bak_" property="expectPriceBak" />
+		<result column="actual_price_bak_" property="actualPriceBak" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 		<result column="settlement_time_" property="settlementTime" />
@@ -56,17 +58,21 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.CourseScheduleStudentPayment" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO course_schedule_student_payment (id_,group_type_,music_group_id_,course_schedule_id_,user_id_,
-			original_price_,expect_price_,actual_price_,create_time_,update_time_,settlement_time_,class_group_id_,batch_no_,be_merged_,tenant_id_,activity_user_mapper_id_)
+			original_price_,expect_price_,actual_price_,expect_price_bak_,actual_price_bak_,create_time_,update_time_,
+		settlement_time_,class_group_id_,batch_no_,be_merged_,tenant_id_,activity_user_mapper_id_)
 		VALUES(#{id},#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{courseScheduleId},#{userId},
-			#{originalPrice},#{expectPrice},#{actualPrice},#{createTime},NOW(),#{settlementTime},#{classGroupId},#{batchNo},#{beMerged},#{tenantId},#{activityUserMapperId})
+			#{originalPrice},#{expectPrice},#{actualPrice},#{expectPriceBak},#{actualPriceBak},NOW(),NOW()
+			,#{settlementTime},#{classGroupId},#{batchNo},#{beMerged},#{tenantId},#{activityUserMapperId})
 	</insert>
     <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
-		INSERT INTO course_schedule_student_payment (id_,group_type_,music_group_id_,course_schedule_id_,user_id_,expect_price_,
-				original_price_,actual_price_,create_time_,update_time_,settlement_time_,class_group_id_,batch_no_,be_merged_,tenant_id_,activity_user_mapper_id_)
+		INSERT INTO course_schedule_student_payment (id_,group_type_,music_group_id_,course_schedule_id_,user_id_,
+		expect_price_,original_price_,actual_price_,expect_price_bak_,actual_price_bak_,create_time_,update_time_,
+		settlement_time_,class_group_id_,batch_no_,be_merged_,tenant_id_,activity_user_mapper_id_)
 		VALUE
 		<foreach collection="list" item="data" separator=",">
-			(#{data.id},#{data.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{data.musicGroupId},#{data.courseScheduleId},#{data.userId},#{data.expectPrice},
-			#{data.originalPrice},#{data.actualPrice},now(),now(),#{data.settlementTime},#{data.classGroupId},#{data.batchNo},#{data.beMerged},#{data.tenantId},#{data.activityUserMapperId})
+			(#{data.id},#{data.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{data.musicGroupId},#{data.courseScheduleId},#{data.userId},
+			#{data.expectPrice},#{data.originalPrice},#{data.actualPrice},#{data.expectPriceBak},#{data.actualPriceBak},now(),now(),
+		    #{data.settlementTime},#{data.classGroupId},#{data.batchNo},#{data.beMerged},#{data.tenantId},#{data.activityUserMapperId})
 		</foreach>
     </insert>
 
@@ -95,8 +101,11 @@
 			<if test="actualPrice != null">
 				actual_price_ = #{actualPrice},
 			</if>
-			<if test="createTime != null">
-				create_time_ = #{createTime},
+			<if test="expectPriceBak != null">
+				expect_price_bak_ = #{expectPriceBak},
+			</if>
+			<if test="actualPriceBak != null">
+				actual_price_bak_ = #{actualPriceBak},
 			</if>
 			<if test="classGroupId != null">
 				class_group_id_ = #{classGroupId},
@@ -139,8 +148,11 @@
 				<if test="courseScheduleStudentPayment.actualPrice != null">
 					actual_price_ = #{courseScheduleStudentPayment.actualPrice},
 				</if>
-				<if test="courseScheduleStudentPayment.createTime != null">
-					create_time_ = #{courseScheduleStudentPayment.createTime},
+				<if test="courseScheduleStudentPayment.expectPriceBak != null">
+					expect_price_bak_ = #{courseScheduleStudentPayment.expectPriceBak},
+				</if>
+				<if test="courseScheduleStudentPayment.actualPriceBak != null">
+					actual_price_bak_ = #{courseScheduleStudentPayment.actualPriceBak},
 				</if>
 				<if test="courseScheduleStudentPayment.classGroupId != null">
 					class_group_id_ = #{courseScheduleStudentPayment.classGroupId},

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

@@ -46,6 +46,7 @@
         <result column="username_" property="name"/>
         <result column="deposit_fee_" property="depositFee"/>
         <result column="surplus_course_fee_" property="surplusCourseFee"/>
+        <result column="expect_surplus_course_fee_" property="expectSurplusCourseFee"/>
         <result column="paying_status_" property="payingStatus"/>
         <result column="has_cloud_teacher_" property="hasCloudTeacher"/>
         <result column="none_need_cloud_teacher_" property="noneNeedCloudTeacher"/>
@@ -142,6 +143,9 @@
             <if test="userId != null">
                 user_id_,
             </if>
+            <if test="expectSurplusCourseFee != null">
+                expect_surplus_course_fee_,
+            </if>
             <if test="name != null">
                 name_,
             </if>
@@ -215,6 +219,9 @@
             <if test="userId != null">
                 #{userId},
             </if>
+            <if test="expectSurplusCourseFee != null">
+                #{expectSurplusCourseFee},
+            </if>
             <if test="name != null">
                 #{name},
             </if>
@@ -289,6 +296,9 @@
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.StudentRegistration">
         UPDATE student_registration
         <set>
+            <if test="expectSurplusCourseFee != null">
+                expect_surplus_course_fee_ = #{expectSurplusCourseFee},
+            </if>
             <if test="parentsPhone != null">
                 parents_phone_ = #{parentsPhone},
             </if>