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

mec-auth/mec-auth-server/src/main/java/com/ym/mec/auth/config/WebMvcConfig.java

@@ -37,7 +37,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
 	@Override
 	public void addInterceptors(InterceptorRegistry registry) {
 		registry.addInterceptor(tenantInterceptor).addPathPatterns("/**").
-				excludePathPatterns("/queryUserInfo","/user/queryUserByPhone","/user/add",
+				excludePathPatterns("/queryUserInfo","/user/updatePassword","/user/queryUserByPhone","/user/add",
 						"user/queryUserById/*","/role/queryRoleCodeListByUserId","/user/updateSysUser");
 		registry.addInterceptor(operationLogInterceptor).addPathPatterns("/userDevice/unbind").excludePathPatterns("/*");
 	}

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

@@ -173,10 +173,6 @@ public class MusicGroupPaymentCalender extends BaseEntity {
 	@ApiModelProperty(value = "课程展现形式",required = false)
 	private CourseViewTypeEnum courseViewType;
 
-	//会员周期
-	//废弃字段
-	private PeriodEnum memberPeriod;
-
 	//会员有效期(月)
 	//废弃字段
 	private Integer memberValidDate;
@@ -193,14 +189,6 @@ public class MusicGroupPaymentCalender extends BaseEntity {
 	//废弃字段
 	private Integer memberRankSettingId;
 
-	//会员等级名称
-	//废弃字段
-	private String memberRankSettingName;
-
-	//会员是否必选
-	//废弃字段
-	private Boolean memberOptionalFlag = false;
-
 	//申请价格
 	private BigDecimal currentTotalAmount;
 
@@ -251,30 +239,6 @@ public class MusicGroupPaymentCalender extends BaseEntity {
 		this.originalTotalAmount = originalTotalAmount;
 	}
 
-	public Boolean getMemberOptionalFlag() {
-		return memberOptionalFlag;
-	}
-
-	public void setMemberOptionalFlag(Boolean memberOptionalFlag) {
-		this.memberOptionalFlag = memberOptionalFlag;
-	}
-
-	public PeriodEnum getMemberPeriod() {
-		return memberPeriod;
-	}
-
-	public void setMemberPeriod(PeriodEnum memberPeriod) {
-		this.memberPeriod = memberPeriod;
-	}
-
-	public String getMemberRankSettingName() {
-		return memberRankSettingName;
-	}
-
-	public void setMemberRankSettingName(String memberRankSettingName) {
-		this.memberRankSettingName = memberRankSettingName;
-	}
-
 	public BigDecimal getOriginalMemberPaymentAmount() {
 		return originalMemberPaymentAmount;
 	}

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

@@ -2,9 +2,7 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.biz.dal.enums.ExamSongTypeEnum;
-import com.ym.mec.common.enums.AccessSource;
 import com.ym.mec.common.enums.BaseEnum;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -178,6 +176,14 @@ public class SysMusicScore {
 		this.metronomeUrl = metronomeUrl;
 	}
 
+	public String getMidiUrl() {
+		return midiUrl;
+	}
+
+	public void setMidiUrl(String midiUrl) {
+		this.midiUrl = midiUrl;
+	}
+
 	public Integer getShowFlag() {
 		return showFlag;
 	}
@@ -352,13 +358,9 @@ public class SysMusicScore {
 
 	public void setMuseScoreMemo(String museScoreMemo) {
 		this.museScoreMemo = museScoreMemo;
-	}	public String getMidiUrl() {
-		return midiUrl;
 	}
 
-	public void setMidiUrl(String midiUrl) {
-		this.midiUrl = midiUrl;
-	}	@Override
+	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);
 	}

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

@@ -2,7 +2,6 @@ package com.ym.mec.biz.dal.entity;
 
 import com.ym.mec.biz.dal.entity.SysMusicScore.PlayMode;
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;
-
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 /**
@@ -56,6 +55,8 @@ public class SysMusicScoreAccompaniment {
 
 	/** 带节拍器MP3 */
 	private String metronomeUrl;
+
+	private String midiUrl;
 	
 	/**  */
 	private java.util.Date createTime;
@@ -92,6 +93,14 @@ public class SysMusicScoreAccompaniment {
 		this.metronomeUrl = metronomeUrl;
 	}
 
+	public String getMidiUrl() {
+		return midiUrl;
+	}
+
+	public void setMidiUrl(String midiUrl) {
+		this.midiUrl = midiUrl;
+	}
+
 	public String getRankIds() {
 		return rankIds;
 	}

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

@@ -128,7 +128,7 @@ public class AppRedemptionCodeServiceImpl extends ServiceImpl<RedemptionCodeDao,
         Integer volume = redemptionCodeDao.findNull();
         if (volume == null || volume < 10000) {
             Map<Integer, String> receivers = new HashMap<>(1);
-            receivers.put(0, "13512341234");
+            receivers.put(101223, "15623294575");
             sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS,
                                                MessageTypeEnum.APP_REDEMPTION_CODE, receivers, null, 0, null, null,
                                                volume, null, null);

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

@@ -1925,7 +1925,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         musicGroupQuit.setIsVisit(reqMusicGroupQuit.getIsVisit());
         musicGroupQuit.setVisitTime(reqMusicGroupQuit.getVisitTime());
         musicGroupQuit.setStatus(PROCESSING);
-        musicGroupQuit.setCurrentApproveRole(SysUserRoleEnum.EDUCATION + "");
+        //加一的原因是为了和positionId同步，枚举是从0开始
+        musicGroupQuit.setCurrentApproveRole(SysUserRoleEnum.EDUCATION.ordinal() + 1 + "");
 
         if (currentOperatorRoleIds != null && currentOperatorRoleIds.size() > 0) {
             if (!currentOperatorRoleIds.contains(SysUserRoleEnum.ORGAN_MANAGER) && currentOperatorRoleIds.contains(SysUserRoleEnum.EDUCATION)) {
@@ -1933,7 +1934,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 if (musicGroupQuit.getStatus() == ApprovalStatus.APPROVED) {
                     throw new BizException("只能分部经理操作退团");
                 }
-                musicGroupQuit.setCurrentApproveRole(SysUserRoleEnum.ORGAN_MANAGER.ordinal() + "");
+                //加一的原因是为了和positionId同步，枚举是从0开始
+                musicGroupQuit.setCurrentApproveRole(SysUserRoleEnum.ORGAN_MANAGER.ordinal() + 1 + "");
             }
             if (currentOperatorRoleIds.contains(SysUserRoleEnum.ORGAN_MANAGER) && !currentOperatorRoleIds.contains(SysUserRoleEnum.EDUCATION)) {
 
@@ -2126,7 +2128,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (status != ApprovalStatus.PROCESSING) {
             courseScheduleStudentPaymentService.updateCourseActualPrice(Arrays.asList(musicGroupId), Arrays.asList(userId), GroupType.MUSIC);
         } else {
-            musicGroupQuit.setCurrentApproveRole(ORGAN_MANAGER.ordinal() + "");
+            //加一的原因是为了和positionId同步，枚举是从0开始
+            musicGroupQuit.setCurrentApproveRole(ORGAN_MANAGER.ordinal() + 1 + "");
         }
         musicGroupQuitDao.update(musicGroupQuit);
 

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

@@ -1237,12 +1237,9 @@ public class StudentRegistrationServiceImpl extends BaseServiceImpl<Long, Studen
             studentRegistrationDao.update(studentRegistration);
             //减去缴费人数（器乐收费，0元时不减缴费人数）
             studentPaymentOrderService.cutSubjectPlan(studentPaymentOrder);
-            //余额
-            if (studentPaymentOrder.getBalancePaymentAmount() != null && studentPaymentOrder.getBalancePaymentAmount().compareTo(BigDecimal.ZERO) > 0) {
-                sysUserCashAccountService.updateBalance(studentPaymentOrder.getUserId(), studentPaymentOrder.getBalancePaymentAmount(), PlatformCashAccountDetailTypeEnum.REFUNDS, "报名缴费失败");
-            }
-            //优惠券
-            sysCouponCodeService.quit(studentPaymentOrder.getCouponCodeId());
+
+            //退还优惠券和余额
+            studentPaymentOrderService.returnBalanceAndCoupon(studentPaymentOrder,"报名缴费失败");
             //三方乐团不发送缴费通知
             if (musicGroup.getOwnershipType() != null && musicGroup.getOwnershipType() == CooperationOrgan.OwnershipType.OWN) {
                 String studentApplyUrl = sysConfigDao.findConfigValue(SysConfigService.STUDENT_APPLY_URL) + studentRegistration.getMusicGroupId();

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

@@ -327,12 +327,11 @@
                cto.student_id_ as studentId,
                cto.type_ as type,
                case cto.type_
-                   when 1 then '天'
-                   when 2 then '月'
-                   when 3 then '季'
-                   when 4 then '半年'
-                   when 5 then '年'
-                   else ''
+					WHEN 'DAY' THEN '天'
+                    WHEN 'MONTH' THEN '月'
+                    WHEN 'QUARTERLY' THEN '季'
+                    WHEN 'YEAR_HALF' THEN '半年'
+                    WHEN 'YEAR' THEN '年' ELSE ''
                end as typeName,
                cto.time_ as time,
                sj.id_ as subject,
@@ -417,11 +416,11 @@
             cto.id_ AS cloudTeacherOrderId,
             cto.student_id_ AS studentId,
             cto.type_ AS type,
-            CASE cto.type_ WHEN 1 THEN '天'
-                WHEN 2 THEN '月'
-                WHEN 3 THEN '季'
-                WHEN 4 THEN '半年'
-                WHEN 5 THEN '年' ELSE ''
+            CASE cto.type_ WHEN 'DAY' THEN '天'
+                WHEN 'MONTH' THEN '月'
+                WHEN 'QUARTERLY' THEN '季'
+                WHEN 'YEAR_HALF' THEN '半年'
+                WHEN 'YEAR' THEN '年' ELSE ''
                 END AS typeName,
             cto.time_ AS time,
             u.tenant_id_ AS tenantId,

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

@@ -38,11 +38,6 @@
 
 	<!-- 向数据库增加一条记录 -->
 	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.MusicEnlightenmentQuestionnaire" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		<!--
-		<selectKey resultClass="int" keyProperty="id" > 
-		SELECT SEQ_WSDEFINITION_ID.nextval AS ID FROM DUAL 
-		</selectKey>
-		-->
 		INSERT INTO music_enlightenment_questionnaire (music_group_id_,user_id_,user_name_,phone_,current_grade_,current_grade_num_,current_class_,teacher_recommand_subject_id_,musical_instruments_learning_,musical_instruments_name_,join_parent_meeting_,remark_,create_time_,update_time_,tenant_id_)
 		VALUES(#{musicGroupId},#{userId},#{userName},#{phone},#{currentGrade},#{currentGradeNum},#{currentClass},#{teacherRecommandSubjectId},#{musicalInstrumentsLearning},#{musicalInstrumentsName},#{joinParentMeeting},#{remark},NOW(),NOW(),#{tenantId})
 	</insert>
@@ -97,7 +92,7 @@
 
 	<sql id="queryCondition">
 		<where>
-			tenant_id_ = #{tenantId}
+			meq.tenant_id_ = #{tenantId}
 			<if test="musicGroupId!=null and musicGroupId!=''">
 				AND meq.music_group_id_=#{musicGroupId}
 			</if>

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

@@ -37,8 +37,6 @@
         <result column="original_member_payment_amount_" property="originalMemberPaymentAmount"/>
         <result column="member_rank_setting_id_" property="memberRankSettingId"/>
         <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="current_total_amount_" property="currentTotalAmount"/>
         <result column="original_total_amount_" property="originalTotalAmount"/>
     </resultMap>
@@ -61,14 +59,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_,current_total_amount_,original_total_amount_,tenant_id_,organ_id_)
+         ,original_member_payment_amount_,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},#{currentTotalAmount},#{originalTotalAmount},#{tenantId},#{organId})
+               #{memberPaymentAmount},#{memberRankSettingId},#{memberValidDate},#{originalMemberPaymentAmount},
+               #{currentTotalAmount},#{originalTotalAmount},#{tenantId},#{organId})
     </insert>
 
     <insert id="batchInsert" parameterType="com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender" useGeneratedKeys="true"
@@ -77,16 +75,15 @@
         (music_group_id_,music_group_organization_course_settings_id_,pay_user_type_,reject_reason_,start_payment_date_,deadline_payment_date_,status_,expect_num_,
         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_,current_total_amount_,original_total_amount_,tenant_id_,organ_id_)
+         member_payment_amount_,member_rank_setting_id_,member_valid_date_,original_member_payment_amount_
+        ,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},
         #{item.expectNum},#{item.actualNum},#{item.memo},#{item.isGiveMusicNetwork},now(),now(),
         #{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.studentIds},#{item.memberPaymentAmount},#{item.memberRankSettingId},#{item.memberValidDate},#{item.originalMemberPaymentAmount},
          #{item.currentTotalAmount},#{item.originalTotalAmount},#{item.tenantId},#{item.organId})
         </foreach>
     </insert>
@@ -101,12 +98,6 @@
             <if test="originalTotalAmount != null">
                 original_total_amount_ = #{originalTotalAmount},
             </if>
-            <if test="memberOptionalFlag != null">
-                member_optional_flag_ = #{memberOptionalFlag},
-            </if>
-            <if test="memberPeriod != null">
-                member_period_ = #{memberPeriod,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
             <if test="originalMemberPaymentAmount != null">
                 original_member_payment_amount_ = #{originalMemberPaymentAmount},
             </if>

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

@@ -85,7 +85,9 @@
 		SELECT sccpd.*,su.username_,su.phone_,spo.pay_time_ FROM student_cloud_coach_payment_details sccpd
 		LEFT JOIN sys_user su ON  su.id_ = sccpd.user_id_
 		LEFT JOIN student_payment_order spo ON spo.music_group_id_ = sccpd.id_
+		AND spo.user_id_ = sccpd.user_id_ AND spo.type_ = 'MEMBER' AND spo.status_ = 'SUCCESS'
 		<include refid="queryPageSql"/>
+		GROUP BY sccpd.id_
 		ORDER BY sccpd.id_
 		<include refid="global.limit"/>
 	</select>

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

@@ -21,6 +21,7 @@
 		<result column="type_" property="type" />
 		<result column="url_" property="url" />
 		<result column="metronome_url_" property="metronomeUrl" />
+		<result column="midi_url_" property="midiUrl" />
 		<result column="del_flag_" property="delFlag" />
 		<result column="speed_" property="speed" />
 		<result column="create_time_" property="createTime" />
@@ -43,7 +44,7 @@
 
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysMusicScoreAccompaniment" >
-		SELECT sesa.*,ses.name_,ses.type_,ses.url_,sesc.name_ categories_name_,sesc.id_ categories_id_,ses.client_type_,ses.metronome_url_
+		SELECT sesa.*,ses.name_,ses.type_,ses.url_,sesc.name_ categories_name_,sesc.id_ categories_id_,ses.client_type_,ses.metronome_url_,ses.midi_url_
 		FROM sys_music_score ses
 		LEFT JOIN sys_music_score_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
@@ -131,8 +132,8 @@
 	
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="SysMusicScoreAccompaniment" parameterType="map">
-		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_,sesc.parent_id_ parent_categories_id_,ses.client_type_,ses.rank_ids_,ses.render_from_,
-		ses.enable_evaluation_,ses.metronome_url_,ses.muse_score_url_,ses.muse_score_memo_,ses.play_mode_
+		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_,sesc.parent_id_ parent_categories_id_,ses.client_type_,
+		ses.rank_ids_,ses.render_from_,ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_
 		FROM sys_music_score ses
 		LEFT JOIN sys_music_score_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_
@@ -168,7 +169,7 @@
 	</select>
 	<select id="queryAccPage" resultMap="SysMusicScoreAccompaniment">
 		SELECT sesa.*,ses.name_,ses.type_,ses.url_,s.name_ subject_name_,sesc.name_ categories_name_,sesc.id_ categories_id_,sesc.parent_id_ parent_categories_id_,ses.client_type_,
-		ses.enable_evaluation_,ses.metronome_url_,ses.muse_score_url_,ses.muse_score_memo_,ses.play_mode_
+		ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_
 		FROM sys_music_score ses
 		LEFT JOIN sys_music_score_accompaniment sesa ON ses.id_ = sesa.exam_song_id_
 		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = ses.music_score_categories_id_