合班缴费bug

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

@@ -54,6 +54,16 @@ public class MusicGroupPaymentCalenderDto extends BaseEntity {
 	//会员等级编号
 	private Integer memberRankSettingId;
 
+	private BigDecimal originalAmount;
+
+	public BigDecimal getOriginalAmount() {
+		return originalAmount;
+	}
+
+	public void setOriginalAmount(BigDecimal originalAmount) {
+		this.originalAmount = originalAmount;
+	}
+
 	public Integer getMemberValidDate() {
 		return memberValidDate;
 	}

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

@@ -2,20 +2,16 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.CourseViewTypeEnum;
 import com.ym.mec.biz.dal.enums.PeriodEnum;
+import com.ym.mec.common.entity.BaseEntity;
+import com.ym.mec.common.enums.BaseEnum;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import com.ym.mec.common.entity.BaseEntity;
-import com.ym.mec.common.enums.BaseEnum;
-
-import static com.ym.mec.biz.dal.enums.PeriodEnum.MONTH;
-
 /**
  * 对应数据库表(music_group_payment_calender):
  */
@@ -205,18 +201,6 @@ public class MusicGroupPaymentCalender extends BaseEntity {
 	//废弃字段
 	private Boolean memberOptionalFlag = false;
 
-	//乐保年限
-	//废弃字段
-	private BigDecimal musicRepairNum = BigDecimal.ZERO;
-
-	//乐保购买价格
-	//废弃字段
-	private BigDecimal musicRepairActualPrice = BigDecimal.ZERO;
-
-	//乐保是否必选
-	//废弃字段
-	private Boolean musicRepairOptionalFlag = false;
-
 	//申请价格
 	private BigDecimal currentTotalAmount;
 
@@ -275,30 +259,6 @@ public class MusicGroupPaymentCalender extends BaseEntity {
 		this.memberOptionalFlag = memberOptionalFlag;
 	}
 
-	public BigDecimal getMusicRepairNum() {
-		return musicRepairNum;
-	}
-
-	public void setMusicRepairNum(BigDecimal musicRepairNum) {
-		this.musicRepairNum = musicRepairNum;
-	}
-
-	public BigDecimal getMusicRepairActualPrice() {
-		return musicRepairActualPrice;
-	}
-
-	public void setMusicRepairActualPrice(BigDecimal musicRepairActualPrice) {
-		this.musicRepairActualPrice = musicRepairActualPrice;
-	}
-
-	public Boolean getMusicRepairOptionalFlag() {
-		return musicRepairOptionalFlag;
-	}
-
-	public void setMusicRepairOptionalFlag(Boolean musicRepairOptionalFlag) {
-		this.musicRepairOptionalFlag = musicRepairOptionalFlag;
-	}
-
 	public PeriodEnum getMemberPeriod() {
 		return memberPeriod;
 	}

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupPaymentCalenderService.java

@@ -14,7 +14,7 @@ import com.ym.mec.common.service.BaseService;
 public interface MusicGroupPaymentCalenderService extends BaseService<Long, MusicGroupPaymentCalender> {
 
 	/**
-	 * 创建缴费信息
+	 * 创建缴费信息(目前只支持合班缴费)
 	 * @param musicGroupPaymentCalenderDto
 	 * @return
 	 */

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

@@ -4592,6 +4592,11 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
 
         paymentCalenderDto.setMusicGroupId(musicGroup.getId());
         boolean containsAll = musicGroupPaymentCalenderStudentDetails.containsAll(calenderStudentDetails);
+        BigDecimal originalPrice = BigDecimal.ZERO;
+        if(musicGroupPaymentCalenderStudentDetails != null && musicGroupPaymentCalenderStudentDetails.size() > 0){
+            originalPrice = musicGroupPaymentCalenderStudentDetails.stream().map(e -> e.getCourseOriginalPrice()).reduce(BigDecimal.ZERO, BigDecimal::add);
+        }
+        paymentCalenderDto.setOriginalAmount(originalPrice);
         if (!containsAll) {
             paymentCalenderDto.setStatus(AUDITING);
         } else {

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

@@ -162,10 +162,8 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 			}
 		}
 
-		if ((paymentType == PaymentType.ADD_COURSE)) {
-			if(musicGroupPaymentDateRangeList.size() > 1){
-				throw new BizException("[临时加课]不支持多周期缴费");
-			}
+		if(musicGroupPaymentDateRangeList.size() > 1){
+			throw new BizException("创建缴费失败：不支持多周期缴费");
 		}
 		MusicGroup musicGroup = musicGroupDao.getLocked(musicGroupId);
 		if (musicGroup == null) {
@@ -202,9 +200,6 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		if (sysUser == null) {
 			throw new BizException("请登录");
 		}
-		if (musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE && musicGroupPaymentDateRangeList.size() > 1) {
-			throw new BizException("创建缴费失败：会员收费乐团不支持多周期缴费");
-		}
 		// 所有缴费项目已完成排课才能创建下一个缴费项目
 		String organBatchNo = musicGroupPaymentStudentCourseDetailDao.getUnUseBatchNoWithStudentAndCourseTypeAndCourseMinutes(musicGroupId, null, null,musicGroupPaymentCalenderDto.getIgnoreBatchNoList());
 		if (StringUtils.isNoneBlank(organBatchNo)) {
@@ -394,6 +389,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				musicGroupPaymentCalender.setMusicGroupPaymentCalenderCourseSettingsList(newCSList);
 			}
 			musicGroupPaymentCalender.setCurrentTotalAmount(totalPaymentAmount);
+			musicGroupPaymentCalender.setOriginalTotalAmount(musicGroupPaymentCalenderDto.getOriginalAmount());
 
 			if (paymentType == PaymentType.MUSIC_APPLY) {
 				if (i == 0) {

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

@@ -39,9 +39,6 @@
         <result column="member_valid_date_" property="memberValidDate"/>
         <result column="member_period_" property="memberPeriod" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="member_optional_flag_" property="memberOptionalFlag"/>
-        <result column="music_repair_num_" property="musicRepairNum"/>
-        <result column="music_repair_actual_price_" property="musicRepairActualPrice"/>
-        <result column="music_repair_optional_flag_" property="musicRepairOptionalFlag"/>
         <result column="current_total_amount_" property="currentTotalAmount"/>
         <result column="original_total_amount_" property="originalTotalAmount"/>
     </resultMap>
@@ -64,15 +61,14 @@
         actual_num_,memo_,is_give_music_network_,create_time_,update_time_,payment_valid_start_date_,payment_valid_end_date_,
         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_,member_period_,member_optional_flag_,
-         music_repair_num_,music_repair_actual_price_,music_repair_optional_flag_,current_total_amount_,original_total_amount_,tenant_id_,organ_id_)
+         ,original_member_payment_amount_,member_period_,member_optional_flag_,current_total_amount_,original_total_amount_,tenant_id_,organ_id_)
         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(),
         #{paymentValidStartDate},#{paymentValidEndDate},#{paymentPattern},#{paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{paymentAmount},#{batchNo},#{auditMemo},#{operator},#{attribute1},#{attribute2},#{studentIds},
                #{memberPaymentAmount},#{memberRankSettingId},#{memberValidDate},#{originalMemberPaymentAmount},#{memberPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-               #{memberOptionalFlag},#{musicRepairNum},#{musicRepairActualPrice},#{musicRepairOptionalFlag},#{currentTotalAmount},#{originalTotalAmount},#{tenantId},#{organId})
+               #{memberOptionalFlag},#{currentTotalAmount},#{originalTotalAmount},#{tenantId},#{organId})
     </insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender" useGeneratedKeys="true"
@@ -82,7 +78,7 @@
         actual_num_,memo_,is_give_music_network_,create_time_,update_time_,payment_valid_start_date_,payment_valid_end_date_,payment_pattern_,payment_amount_,
         payment_type_,batch_no_,audit_memo_,operator_,attribute1_,attribute2_,student_ids_,
          member_payment_amount_,member_rank_setting_id_,member_valid_date_,original_member_payment_amount_,member_period_
-        ,member_optional_flag_,music_repair_num_,music_repair_actual_price_,music_repair_optional_flag_,current_total_amount_,original_total_amount_,tenant_id_,organ_id_)
+        ,member_optional_flag_,current_total_amount_,original_total_amount_,tenant_id_,organ_id_)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
         (#{item.musicGroupId},#{item.musicGroupOrganizationCourseSettingId},#{item.payUserType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{item.rejectReason},#{item.startPaymentDate},#{item.deadlinePaymentDate},#{item.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
@@ -90,7 +86,7 @@
         #{item.paymentValidStartDate},#{item.paymentValidEndDate},#{item.paymentPattern},#{item.paymentAmount},#{item.paymentType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
         #{item.batchNo},#{item.auditMemo},#{item.operator},#{item.attribute1},#{item.attribute2},
          #{item.studentIds},#{item.memberPaymentAmount},#{item.memberRankSettingId},#{item.memberValidDate},#{item.originalMemberPaymentAmount},#{item.memberPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            #{item.memberOptionalFlag},#{item.musicRepairNum},#{item.musicRepairActualPrice},#{item.musicRepairOptionalFlag},
+            #{item.memberOptionalFlag},
          #{item.currentTotalAmount},#{item.originalTotalAmount},#{item.tenantId},#{item.organId})
         </foreach>
     </insert>
@@ -108,15 +104,6 @@
             <if test="memberOptionalFlag != null">
                 member_optional_flag_ = #{memberOptionalFlag},
             </if>
-            <if test="musicRepairNum != null">
-                music_repair_num_ = #{musicRepairNum},
-            </if>
-            <if test="musicRepairActualPrice != null">
-                music_repair_actual_price_ = #{musicRepairActualPrice},
-            </if>
-            <if test="musicRepairOptionalFlag != null">
-                music_repair_optional_flag_ = #{musicRepairOptionalFlag},
-            </if>
             <if test="memberPeriod != null">
                 member_period_ = #{memberPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>