缴费项目改造

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CooperationCalenderRefundDto.java

@@ -40,6 +40,17 @@ public class CooperationCalenderRefundDto {
     @ApiModelProperty(value = "回款状态",required = false)
     private String refundStatus;
 
+    @ApiModelProperty(value = "合同",required = false)
+    private String contractUrl;
+
+    public String getContractUrl() {
+        return contractUrl;
+    }
+
+    public void setContractUrl(String contractUrl) {
+        this.contractUrl = contractUrl;
+    }
+
     public Long getCalenderId() {
         return calenderId;
     }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -10,30 +11,41 @@ public class MusicGroupCalenderRefundPeriod {
 	/**  */
 	private Integer id;
 	
-	/** 分部 */
+	@ApiModelProperty(value = "分部",required = false)
 	private Integer organId;
 	
-	/** 合作单位编号 */
+	@ApiModelProperty(value = "合作单位编号",required = false)
 	private Integer cooperationOrganId;
 	
-	/** 缴费项目编号 */
+	@ApiModelProperty(value = "缴费项目编号",required = false)
 	private Long calenderId;
 	
-	/** 回款时间 */
+	@ApiModelProperty(value = "回款时间",required = false)
 	private java.util.Date refundDate;
 	
-	/** 回款金额 */
+	@ApiModelProperty(value = "回款金额",required = false)
 	private java.math.BigDecimal refundAmount;
 	
-	/** 剩余待回款金额 */
+	@ApiModelProperty(value = "剩余待回款金额",required = false)
 	private java.math.BigDecimal subRefundAmount;
+
+	@ApiModelProperty(value = "是否完成回款",required = false)
+	private Boolean refundFlag = false;
 	
 	/**  */
 	private java.util.Date createTime;
 	
 	/**  */
 	private java.util.Date updateTime;
-	
+
+	public Boolean getRefundFlag() {
+		return refundFlag;
+	}
+
+	public void setRefundFlag(Boolean refundFlag) {
+		this.refundFlag = refundFlag;
+	}
+
 	public void setId(Integer id){
 		this.id = id;
 	}

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

@@ -351,7 +351,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         musicGroupPaymentCalender.setStatus(status);
         musicGroupPaymentCalender.setOrganId(musicGroup.getOrganId());
 
-        if (musicGroupPaymentCalender.getStatus() != AUDITING && musicGroupPaymentBaseCalender.getPaymentType() != MUSIC_APPLY) {
+        if (musicGroupPaymentCalender.getStatus() != AUDITING && musicGroupPaymentCalender.getPaymentType() != MUSIC_APPLY) {
             if (date.after(musicGroupPaymentCalender.getStartPaymentDate())) {
                 musicGroupPaymentCalender.setStatus(PaymentCalenderStatusEnum.OPEN);
             } else if (date.after(musicGroupPaymentCalender.getDeadlinePaymentDate())) {

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

@@ -14,6 +14,7 @@
 		<result column="refund_date_" property="refundDate" />
 		<result column="refund_amount_" property="refundAmount" />
 		<result column="sub_refund_amount_" property="subRefundAmount" />
+		<result column="refund_flag_" property="refundFlag" />
 		<result column="create_time_" property="createTime" />
 		<result column="update_time_" property="updateTime" />
 	</resultMap>
@@ -29,16 +30,16 @@
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupCalenderRefundPeriod" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO music_group_calender_refund_period (organ_id_,cooperation_organ_id_,calender_id_,
-		                                                refund_date_,refund_amount_,sub_refund_amount_,create_time_,update_time_)
-		VALUES(#{organId},#{cooperationOrganId},#{calenderId},#{refundDate},#{refundAmount},#{subRefundAmount},NOW(),NOW())
+		                                                refund_date_,refund_amount_,sub_refund_amount_,refund_flag_,create_time_,update_time_)
+		VALUES(#{organId},#{cooperationOrganId},#{calenderId},#{refundDate},#{refundAmount},#{subRefundAmount},#{refundFlag},NOW(),NOW())
 	</insert>
 	<insert id="batchInsert">
 		INSERT INTO music_group_calender_refund_period (organ_id_,cooperation_organ_id_,calender_id_,
-														refund_date_,refund_amount_,sub_refund_amount_,create_time_,update_time_)
+														refund_date_,refund_amount_,sub_refund_amount_,refund_flag_,create_time_,update_time_)
 		VALUES
 		<foreach collection="refundPeriods" separator="," item="bean">
 			(#{bean.organId},#{bean.cooperationOrganId},#{bean.calenderId},#{bean.refundDate},
-			 #{bean.refundAmount},#{bean.subRefundAmount},#{bean.createTime},#{bean.updateTime})
+			 #{bean.refundAmount},#{bean.subRefundAmount},{bean.refundFlag},#{bean.createTime},#{bean.updateTime})
 		</foreach>
 	</insert>
 
@@ -99,6 +100,7 @@
 		<result property="prepaidFee" column="prepaidFee"/>
 		<result property="nextRefundDate" column="nextRefundDate"/>
 		<result property="refundStatus" column="refundStatus"/>
+		<result property="contractUrl" column="contract_url_"/>
 	</resultMap>
 	<sql id="queryCoopCalenderSql">
 		<if test="cooperationId != null">
@@ -127,7 +129,7 @@
 	<select id="queryCoopCalender" resultMap="CooperationCalenderRefundDto">
 		select crp.calender_id_,mgpc.music_group_id_,mg.name_ music_group_name_,mgpc.batch_no_,mgpc.payment_type_,mgpc.calender_fee_type_,
 			   SUM(crp.refund_amount_) receivable_,SUM(crp.sub_refund_amount_) prepaidFee,
-			   MIN(CASE WHEN crp.refund_flag_ = 0 THEN crp.refund_date_ ELSE NULL END) nextRefundDate
+			   MIN(CASE WHEN crp.refund_flag_ = 0 THEN crp.refund_date_ ELSE NULL END) nextRefundDate,crp.organ_id_,mgpc.contract_url_
 		from music_group_calender_refund_period crp
 				 left join music_group_payment_calender mgpc ON mgpc.id_ = crp.calender_id_
 				 left join music_group mg ON mg.id_ = mgpc.music_group_id_