缴费项目改造

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

@@ -73,6 +73,17 @@ public class MusicGroupPaymentBaseCalender {
 	@ApiModelProperty(value = "学校缴费折扣价", required = false)
 	private BigDecimal currentTotalAmount;
 
+	@ApiModelProperty(value = "合同url", required = false)
+	private String contractUrl;
+
+	public String getContractUrl() {
+		return contractUrl;
+	}
+
+	public void setContractUrl(String contractUrl) {
+		this.contractUrl = contractUrl;
+	}
+
 	public BigDecimal getCurrentTotalAmount() {
 		return currentTotalAmount;
 	}

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

@@ -29,13 +29,13 @@ public class CourseScheduleStudentPayment extends BaseEntity implements Comparab
 	/**  */
 	private Integer userId;
 
-	private BigDecimal originalPrice;
+	private BigDecimal originalPrice = BigDecimal.ZERO;
 	
 	/** 预计价格 */
-	private java.math.BigDecimal expectPrice;
+	private java.math.BigDecimal expectPrice = BigDecimal.ZERO;
 	
 	/**  */
-	private java.math.BigDecimal actualPrice;
+	private java.math.BigDecimal actualPrice = BigDecimal.ZERO;
 	
 	/**  */
 	private java.util.Date createTime;

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

@@ -215,6 +215,17 @@ public class MusicGroupPaymentCalender extends BaseEntity {
 	@ApiModelProperty(value = "学校缴费计价标准，STUDENT、TEACHER", required = false)
 	private String calenderFeeType;
 
+	@ApiModelProperty(value = "合同", required = false)
+	private String contractUrl;
+
+	public String getContractUrl() {
+		return contractUrl;
+	}
+
+	public void setContractUrl(String contractUrl) {
+		this.contractUrl = contractUrl;
+	}
+
 	public String getCalenderFeeJson() {
 		return calenderFeeJson;
 	}

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

@@ -497,11 +497,11 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 				if(courseMinutes >= detail.getSubCourseMinutes()){
 					detail.setUsedCourseMinutes(detail.getUsedCourseMinutes() + detail.getSubCourseMinutes());
 					detail.setSubCourseMinutes(0);
-					courseMinutes = courseMinutes - detail.getSubCourseMinutes();
-					studentPayment.setOriginalPrice(detail.getSubCourseOriginalPrice());
-					studentPayment.setExpectPrice(detail.getSubCourseCurrentPrice());
+					studentPayment.setOriginalPrice(studentPayment.getOriginalPrice().add(detail.getSubCourseOriginalPrice()));
+					studentPayment.setExpectPrice(studentPayment.getExpectPrice().add(detail.getSubCourseCurrentPrice()));
 					detail.setSubCourseCurrentPrice(BigDecimal.ZERO);
 					detail.setSubCourseOriginalPrice(BigDecimal.ZERO);
+					courseMinutes = courseMinutes - detail.getSubCourseMinutes();
 				}else{
 					detail.setUsedCourseMinutes(detail.getUsedCourseMinutes() + courseDuration);
 					detail.setSubCourseMinutes(detail.getSubCourseMinutes() - courseDuration);
@@ -510,8 +510,8 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 					BigDecimal unitMinuteOriginalPrice = detail.getCourseOriginalPrice().divide(new BigDecimal(detail.getTotalCourseMinutes()), CommonConstants.DECIMAL_PLACE, BigDecimal.ROUND_DOWN);
 					BigDecimal originalPrice = unitMinuteOriginalPrice.multiply(new BigDecimal(courseMinutes)).setScale(2, BigDecimal.ROUND_DOWN);
 					BigDecimal expectPrice = unitMinuteCurrentPrice.multiply(new BigDecimal(courseMinutes)).setScale(2, BigDecimal.ROUND_DOWN);
-					studentPayment.setOriginalPrice(originalPrice);
-					studentPayment.setExpectPrice(expectPrice);
+					studentPayment.setOriginalPrice(studentPayment.getOriginalPrice().add(originalPrice));
+					studentPayment.setExpectPrice(studentPayment.getExpectPrice().add(expectPrice));
 					detail.setSubCourseCurrentPrice(detail.getSubCourseOriginalPrice().subtract(originalPrice));
 					detail.setSubCourseOriginalPrice(detail.getSubCourseCurrentPrice().subtract(expectPrice));
 					courseMinutes = 0;

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

@@ -43,6 +43,7 @@
         <result column="is_show_sale_price_" property="isShowSalePrice"/>
         <result column="calender_fee_type_" property="calenderFeeType"/>
         <result column="calender_fee_json_" property="calenderFeeJson"/>
+        <result column="contract_url_" property="contractUrl"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -64,7 +65,7 @@
         payment_pattern_,payment_type_,payment_amount_,batch_no_,audit_memo_,operator_,attribute1_,
          attribute2_,student_ids_,member_payment_amount_,member_rank_setting_id_,member_valid_date_
          ,original_member_payment_amount_,current_total_amount_,original_total_amount_,tenant_id_,organ_id_,
-         cloud_teacher_payment_flag_,payment_item_show_state_,is_show_sale_price_,calender_fee_type_,calender_fee_json_)
+         cloud_teacher_payment_flag_,payment_item_show_state_,is_show_sale_price_,calender_fee_type_,calender_fee_json_,contract_url_)
         VALUES(#{musicGroupId},#{musicGroupOrganizationCourseSettingId},#{payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{rejectReason},#{startPaymentDate},#{deadlinePaymentDate},#{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{expectNum},#{actualNum},#{memo},#{isGiveMusicNetwork},now(),now(),
@@ -72,7 +73,7 @@
         #{paymentAmount},#{batchNo},#{auditMemo},#{operator},#{attribute1},#{attribute2},#{studentIds},
                #{memberPaymentAmount},#{memberRankSettingId},#{memberValidDate},#{originalMemberPaymentAmount},
                #{currentTotalAmount},#{originalTotalAmount},#{tenantId},#{organId},#{cloudTeacherPaymentFlag},
-               #{paymentItemShowState},#{isShowSalePrice},#{calenderFeeType},#{calenderFeeJson})
+               #{paymentItemShowState},#{isShowSalePrice},#{calenderFeeType},#{calenderFeeJson},#{contractUrl})
     </insert>