经营报表配置项改动

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/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,9 @@ public class MusicGroupPaymentCalenderMember extends MusicGroupPaymentCalenderBa
     @ApiModelProperty(value = "自动激活团练宝标识", required = false)
     private Boolean autoActivationFlag = false;
 
+    @ApiModelProperty(value = "团练宝收入，actualAmount减去收入以及其他费用，剩下的就是课程费用", required = false)
+    private BigDecimal income;
+
     public Boolean getAutoActivationFlag() {
         return autoActivationFlag;
     }

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>