缴费项目改造

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

@@ -264,10 +264,10 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         BeanUtils.copyProperties(musicGroupPaymentBaseCalender,musicGroupPaymentCalender);
         //判断缴费项目类型
         if (musicGroup.getStatus() == MusicGroupStatusEnum.DRAFT) {
-            musicGroupPaymentBaseCalender.setPaymentType(MUSIC_APPLY);
+            musicGroupPaymentCalender.setPaymentType(MUSIC_APPLY);
         } else {
             if (calenderAddStudent != null && calenderAddStudent.getStudentIds() != null) {
-                musicGroupPaymentBaseCalender.setPaymentType(ADD_STUDENT);
+                musicGroupPaymentCalender.setPaymentType(ADD_STUDENT);
                 //预计缴费人数
                 musicGroupPaymentCalender.setAttribute1(calenderAddStudent.getClassGroupIds());
                 musicGroupPaymentCalender.setStudentIds(calenderAddStudent.getStudentIds().toString());
@@ -276,9 +276,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
                 checkAddStudent(calenderAddStudent, musicGroup);
             } else {
                 if (musicGroupPaymentBaseCalender.getMusicGroupOrganizationCourseSettingId() != null) {
-                    musicGroupPaymentBaseCalender.setPaymentType(MUSIC_RENEW);
+                    musicGroupPaymentCalender.setPaymentType(MUSIC_RENEW);
                 } else {
-                    musicGroupPaymentBaseCalender.setPaymentType(ADD_COURSE);
+                    musicGroupPaymentCalender.setPaymentType(ADD_COURSE);
                 }
             }
         }

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

@@ -41,6 +41,8 @@
         <result column="original_total_amount_" property="originalTotalAmount"/>
         <result column="payment_item_show_state_" property="paymentItemShowState"/>
         <result column="is_show_sale_price_" property="isShowSalePrice"/>
+        <result column="calender_fee_type_" property="calenderFeeType"/>
+        <result column="calender_fee_json_" property="calenderFeeJson"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -61,14 +63,16 @@
         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_,current_total_amount_,original_total_amount_,tenant_id_,organ_id_,cloud_teacher_payment_flag_,payment_item_show_state_,is_show_sale_price_)
+         ,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_)
         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},
-               #{currentTotalAmount},#{originalTotalAmount},#{tenantId},#{organId},#{cloudTeacherPaymentFlag},#{paymentItemShowState},#{isShowSalePrice})
+               #{currentTotalAmount},#{originalTotalAmount},#{tenantId},#{organId},#{cloudTeacherPaymentFlag},
+               #{paymentItemShowState},#{isShowSalePrice},#{calenderFeeType},#{calenderFeeJson})
     </insert>