feat:乐团费用改造

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
@@ -57,7 +58,10 @@ public class MusicGroupPaymentCalenderDetail {
 
 	/**  */
 	private java.util.Date deadlinePaymentDateMgpc;
-	
+
+	@ApiModelProperty(value = "订单编号",required = true)
+	private Long paymentOrderId;
+
 	/**  */
 	private java.util.Date updateTime;
 	
@@ -155,7 +159,15 @@ public class MusicGroupPaymentCalenderDetail {
 	public Long getMusicGroupPaymentCalenderId(){
 		return this.musicGroupPaymentCalenderId;
 	}
-			
+
+	public Long getPaymentOrderId() {
+		return paymentOrderId;
+	}
+
+	public void setPaymentOrderId(Long paymentOrderId) {
+		this.paymentOrderId = paymentOrderId;
+	}
+
 	public void setUserId(Integer userId){
 		this.userId = userId;
 	}

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

@@ -18,6 +18,7 @@
 		<result column="deadline_payment_date_" property="deadlinePaymentDate" />
 		<result column="start_payment_date_mgpc_" property="startPaymentDateMgpc" />
 		<result column="deadline_payment_date_mgpc_" property="deadlinePaymentDateMgpc" />
+		<result column="payment_order_id_" property="paymentOrderId"/>
 		<result column="update_time_" property="updateTime" />
 		<result column="create_time_" property="createTime" />
 		<result column="open_" property="open"/>
@@ -48,20 +49,20 @@
 		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_payment_calender_detail
 		(id_,music_group_payment_calender_id_,user_id_,expect_amount_,actual_amount_,payment_status_,
-		user_status_,pay_time_,update_time_,create_time_,start_payment_date_,deadline_payment_date_)
+		user_status_,pay_time_,update_time_,create_time_,start_payment_date_,deadline_payment_date_,payment_order_id_)
 		VALUES(#{id},#{musicGroupPaymentCalenderId},#{userId},#{expectAmount},#{actualAmount},#{paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		#{userStatus},#{payTime},#{updateTime},#{createTime},#{startPaymentDate},#{deadlinePaymentDate})
+		#{userStatus},#{payTime},#{updateTime},#{createTime},#{startPaymentDate},#{deadlinePaymentDate},#{paymentOrderId})
 	</insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalenderDetail">
         INSERT INTO music_group_payment_calender_detail
 		(id_,music_group_payment_calender_id_,user_id_,expect_amount_,actual_amount_,
-		payment_status_,user_status_,pay_time_,update_time_,create_time_,start_payment_date_,deadline_payment_date_)
+		payment_status_,user_status_,pay_time_,update_time_,create_time_,start_payment_date_,deadline_payment_date_,payment_order_id_)
 		VALUES
 		<foreach collection="list" item="item" separator=",">
             (#{item.id},#{item.musicGroupPaymentCalenderId},#{item.userId},#{item.expectAmount},
             #{item.actualAmount},#{item.paymentStatus,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.userStatus},#{item.payTime},
-            #{item.updateTime},#{item.createTime},#{item.startPaymentDate},#{item.deadlinePaymentDate})
+            #{item.updateTime},#{item.createTime},#{item.startPaymentDate},#{item.deadlinePaymentDate},#{item.paymentOrderId})
         </foreach>
     </insert>
 
@@ -103,6 +104,9 @@
 			<if test="payTime != null">
 				pay_time_ = #{payTime},
 			</if>
+			<if test="paymentOrderId != null">
+				payment_order_id_ = #{paymentOrderId},
+			</if>
 		</set>
 		WHERE id_ = #{id}
 	</update>
@@ -141,7 +145,10 @@
 					actual_amount_ = #{item.actualAmount},
 				</if>
 				<if test="item.payTime != null">
-					pay_time_ = #{item.payTime}
+					pay_time_ = #{item.payTime},
+				</if>
+				<if test="item.paymentOrderId != null">
+					payment_order_id_ = #{item.paymentOrderId},
 				</if>
 			</set>
 			WHERE id_ = #{item.id}