Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_training_202303

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

@@ -40,7 +40,7 @@ public class ChargeTypeSubjectMapper extends BaseEntity {
 	private BigDecimal depositFee;
 
 	/**  */
-	@ApiModelProperty(value = "课程费用",required = false)
+	@ApiModelProperty(value = "课程费用（比例）",required = false)
 	private BigDecimal fee;
 	
 	@ApiModelProperty(value = "商品折扣率",required = false)

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/MemberFeeSetting.java

@@ -4,6 +4,8 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.common.entity.BaseEntity;
 
+import java.math.BigDecimal;
+
 /**
  * 对应数据库表(member_fee_setting):
  */
@@ -20,6 +22,8 @@ public class MemberFeeSetting extends BaseEntity {
 	
 	/**  */
 	private java.math.BigDecimal originalDayFee;
+
+	private BigDecimal incomeDayFee;
 	
 	/**  */
 	private java.math.BigDecimal currentMonthFee;
@@ -29,6 +33,8 @@ public class MemberFeeSetting extends BaseEntity {
 	
 	/**  */
 	private java.math.BigDecimal originalMonthFee;
+
+	private BigDecimal incomeMonthFee;
 	
 	/**  */
 	private java.math.BigDecimal currentQuarterlyFee;
@@ -38,6 +44,8 @@ public class MemberFeeSetting extends BaseEntity {
 	
 	/**  */
 	private java.math.BigDecimal originalQuarterlyFee;
+
+	private BigDecimal incomeQuarterlyFee;
 	
 	/**  */
 	private java.math.BigDecimal currentHalfYearFee;
@@ -47,6 +55,8 @@ public class MemberFeeSetting extends BaseEntity {
 	
 	/**  */
 	private java.math.BigDecimal originalHalfYearFee;
+
+	private BigDecimal incomeHalfYearFee;
 	
 	/**  */
 	private java.math.BigDecimal currentYearFee;
@@ -56,7 +66,49 @@ public class MemberFeeSetting extends BaseEntity {
 	
 	/**  */
 	private java.math.BigDecimal originalYearFee;
-	
+
+	private BigDecimal incomeYearFee;
+
+	public BigDecimal getIncomeDayFee() {
+		return incomeDayFee;
+	}
+
+	public void setIncomeDayFee(BigDecimal incomeDayFee) {
+		this.incomeDayFee = incomeDayFee;
+	}
+
+	public BigDecimal getIncomeMonthFee() {
+		return incomeMonthFee;
+	}
+
+	public void setIncomeMonthFee(BigDecimal incomeMonthFee) {
+		this.incomeMonthFee = incomeMonthFee;
+	}
+
+	public BigDecimal getIncomeQuarterlyFee() {
+		return incomeQuarterlyFee;
+	}
+
+	public void setIncomeQuarterlyFee(BigDecimal incomeQuarterlyFee) {
+		this.incomeQuarterlyFee = incomeQuarterlyFee;
+	}
+
+	public BigDecimal getIncomeHalfYearFee() {
+		return incomeHalfYearFee;
+	}
+
+	public void setIncomeHalfYearFee(BigDecimal incomeHalfYearFee) {
+		this.incomeHalfYearFee = incomeHalfYearFee;
+	}
+
+	public BigDecimal getIncomeYearFee() {
+		return incomeYearFee;
+	}
+
+	public void setIncomeYearFee(BigDecimal incomeYearFee) {
+		this.incomeYearFee = incomeYearFee;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}

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

@@ -3,6 +3,8 @@ package com.ym.mec.biz.dal.entity;
 import com.ym.mec.biz.dal.enums.PeriodEnum;
 import io.swagger.annotations.ApiModelProperty;
 
+import java.math.BigDecimal;
+
 public class MusicGroupPaymentCalenderMember extends MusicGroupPaymentCalenderBase{
     @ApiModelProperty(value = "会员名称", required = false)
     private String name;
@@ -18,6 +20,17 @@ public class MusicGroupPaymentCalenderMember extends MusicGroupPaymentCalenderBa
     @ApiModelProperty(value = "自动激活团练宝标识", required = false)
     private Boolean autoActivationFlag = false;
 
+    @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/MemberFeeSettingMapper.xml

@@ -9,18 +9,23 @@
 		<result column="current_day_fee_" property="currentDayFee" />
 		<result column="group_purchase_day_fee_" property="groupPurchaseDayFee" />
 		<result column="original_day_fee_" property="originalDayFee" />
+		<result column="income_day_fee_" property="incomeDayFee" />
 		<result column="current_month_fee_" property="currentMonthFee" />
 		<result column="group_purchase_month_fee_" property="groupPurchaseMonthFee" />
 		<result column="original_month_fee_" property="originalMonthFee" />
+		<result column="income_month_fee_" property="incomeMonthFee" />
 		<result column="current_quarterly_fee_" property="currentQuarterlyFee" />
 		<result column="group_purchase_quarterly_fee_" property="groupPurchaseQuarterlyFee" />
 		<result column="original_quarterly_fee_" property="originalQuarterlyFee" />
+		<result column="income_quarterly_fee_" property="incomeQuarterlyFee" />
 		<result column="current_half_year_fee_" property="currentHalfYearFee" />
 		<result column="group_purchase_half_year_fee_" property="groupPurchaseHalfYearFee" />
 		<result column="original_half_year_fee_" property="originalHalfYearFee" />
+		<result column="income_half_year_fee_" property="incomeHalfYearFee" />
 		<result column="current_year_fee_" property="currentYearFee" />
 		<result column="group_purchase_year_fee_" property="groupPurchaseYearFee" />
 		<result column="original_year_fee_" property="originalYearFee" />
+		<result column="income_year_fee" property="incomeYearFee" />
 		<result column="tenant_id_" property="tenantId" />
 	</resultMap>
 
@@ -39,11 +44,17 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MemberFeeSetting"
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
-			AS ID FROM DUAL </selectKey> -->
 		INSERT INTO member_fee_setting
-		(id_,current_day_fee_,group_purchase_day_fee_,original_day_fee_,current_month_fee_,group_purchase_month_fee_,original_month_fee_,current_quarterly_fee_,group_purchase_quarterly_fee_,original_quarterly_fee_,current_half_year_fee_,group_purchase_half_year_fee_,original_half_year_fee_,current_year_fee_,group_purchase_year_fee_,original_year_fee_,tenant_id_)
-		VALUES(#{id},#{currentDayFee},#{groupPurchaseDayFee},#{originalDayFee},#{currentMonthFee},#{groupPurchaseMonthFee},#{originalMonthFee},#{currentQuarterlyFee},#{groupPurchaseQuarterlyFee},#{originalQuarterlyFee},#{currentHalfYearFee},#{groupPurchaseHalfYearFee},#{originalHalfYearFee},#{currentYearFee},#{groupPurchaseYearFee},#{originalYearFee},#{tenantId})
+		(id_,current_day_fee_,group_purchase_day_fee_,original_day_fee_,income_day_fee_,
+		 current_month_fee_,group_purchase_month_fee_,original_month_fee_,income_month_fee_,
+		 current_quarterly_fee_,group_purchase_quarterly_fee_,original_quarterly_fee_,income_quarterly_fee_,
+		 current_half_year_fee_,group_purchase_half_year_fee_,original_half_year_fee_,income_half_year_fee_,
+		 current_year_fee_,group_purchase_year_fee_,original_year_fee_,income_year_fee_,tenant_id_)
+		VALUES(#{id},#{currentDayFee},#{groupPurchaseDayFee},#{originalDayFee},#{incomeDayFee},
+		       #{currentMonthFee},#{groupPurchaseMonthFee},#{originalMonthFee},#{incomeMonthFee},
+		       #{currentQuarterlyFee},#{groupPurchaseQuarterlyFee},#{originalQuarterlyFee},#{incomeQuarterlyFee},
+		       #{currentHalfYearFee},#{groupPurchaseHalfYearFee},#{originalHalfYearFee},#{incomeHalfYearFee},
+		       #{currentYearFee},#{groupPurchaseYearFee},#{originalYearFee},#{incomeYearFee},#{tenantId})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -53,6 +64,11 @@
 				original_half_year_fee_ = #{originalHalfYearFee},
 				original_quarterly_fee_ = #{originalQuarterlyFee},
 				original_day_fee_ = #{originalDayFee},
+				income_day_fee_ = #{incomeDayFee},
+				income_month_fee_ = #{incomeMonthFee},
+				income_quarterly_fee_ = #{incomeQuarterlyFee},
+				income_half_year_fee_ = #{incomeHalfYearFee},
+				income_year_fee_ = #{incomeYearFee},
 			<if test="id != null">
 				id_ = #{id},
 			</if>

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

@@ -23,18 +23,23 @@
 			<result column="current_day_fee_" property="currentDayFee" />
 			<result column="group_purchase_day_fee_" property="groupPurchaseDayFee" />
 			<result column="original_day_fee_" property="originalDayFee" />
+			<result column="income_day_fee_" property="incomeDayFee" />
 			<result column="current_month_fee_" property="currentMonthFee" />
 			<result column="group_purchase_month_fee_" property="groupPurchaseMonthFee" />
 			<result column="original_month_fee_" property="originalMonthFee" />
+			<result column="income_month_fee_" property="incomeMonthFee" />
 			<result column="current_quarterly_fee_" property="currentQuarterlyFee" />
 			<result column="group_purchase_quarterly_fee_" property="groupPurchaseQuarterlyFee" />
 			<result column="original_quarterly_fee_" property="originalQuarterlyFee" />
+			<result column="income_quarterly_fee_" property="incomeQuarterlyFee" />
 			<result column="current_half_year_fee_" property="currentHalfYearFee" />
 			<result column="group_purchase_half_year_fee_" property="groupPurchaseHalfYearFee" />
 			<result column="original_half_year_fee_" property="originalHalfYearFee" />
+			<result column="income_half_year_fee_" property="incomeHalfYearFee" />
 			<result column="current_year_fee_" property="currentYearFee" />
 			<result column="group_purchase_year_fee_" property="groupPurchaseYearFee" />
 			<result column="original_year_fee_" property="originalYearFee" />
+			<result column="income_year_fee_" property="incomeYearFee" />
 		</association>
 	</resultMap>
 

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>