Merge remote-tracking branch 'origin/system_fee_update' into system_fee_update

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

@@ -156,22 +156,22 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
 
 		switch (periodEnum) {
 		case DAY:
-			actualAmount = memberFeeSetting.getCurrentDayFee();
+			actualAmount = memberFeeSetting.getOriginalDayFee();
 			cloudTeacherOrder.setType(1);
 			cloudTeacherOrder.setTime(1);
 			break;
 		case MONTH:
-			actualAmount = memberFeeSetting.getCurrentMonthFee();
+			actualAmount = memberFeeSetting.getOriginalMonthFee();
 			cloudTeacherOrder.setType(2);
 			cloudTeacherOrder.setTime(1);
 			break;
 		case YEAR_HALF:
-			actualAmount = memberFeeSetting.getCurrentHalfYearFee();
+			actualAmount = memberFeeSetting.getOriginalHalfYearFee();
 			cloudTeacherOrder.setType(2);
 			cloudTeacherOrder.setTime(6);
 			break;
 		case YEAR:
-			actualAmount = memberFeeSetting.getCurrentYearFee();
+			actualAmount = memberFeeSetting.getOriginalYearFee();
 			cloudTeacherOrder.setType(3);
 			cloudTeacherOrder.setTime(1);
 			break;

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

@@ -38,6 +38,7 @@
         <result column="order_id_" property="cloudTeacherOrder.orderId"/>
         <result column="trans_status_" property="studentPaymentOrder.status"/>
         <result column="expect_amount_" property="studentPaymentOrder.expectAmount"/>
+        <result column="pay_time_" property="studentPaymentOrder.payTime"/>
         <result column="name_" property="memberRankSetting.name"/>
         <result column="icon_" property="memberRankSetting.icon"/>
         <result column="music_group_id_" property="studentPaymentOrder.musicGroupId"/>
@@ -120,7 +121,7 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="CloudTeacherOrderDto" parameterType="map">
-        SELECT cto.*,spo.status_ trans_status_,spo.expect_amount_,mrs.name_,mrs.icon_ FROM cloud_teacher_order cto
+        SELECT cto.*,spo.status_ trans_status_,spo.expect_amount_,spo.pay_time_,mrs.name_,mrs.icon_ FROM cloud_teacher_order cto
         left join student_payment_order spo on cto.order_id_ = spo.id_
         left join member_rank_setting mrs on mrs.id_ = cto.level_
         where spo.type_ = 'MEMBER'