Merge branch 'feature/1022_vip' into dev

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

@@ -952,7 +952,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 //保存团练宝数据
                 CloudTeacherOrder cloudTeacherOrder = new CloudTeacherOrder();
                 cloudTeacherOrder.setOrderId(studentPaymentOrder.getId());
-                cloudTeacherOrder.setLevel(1);
+                cloudTeacherOrder.setLevel(activity.getGiveMemberRankId());
                 cloudTeacherOrder.setStatus(1);
                 cloudTeacherOrder.setType(activity.getPeriodEnum());
                 cloudTeacherOrder.setTime(studentPaymentOrder.getActivityBuyNum());
@@ -960,7 +960,7 @@ public class MemberRankSettingServiceImpl extends BaseServiceImpl<Integer, Membe
                 cloudTeacherOrder.setOrganId(studentPaymentOrder.getOrganId());
                 cloudTeacherOrder.setAmount(studentPaymentOrder.getExpectAmount());
                 cloudTeacherOrder.setOperatingAmount(studentPaymentOrder.getExpectAmount());
-                cloudTeacherOrderService.save(cloudTeacherOrder,tenantConfigService.autoActivationFlag(cloudTeacherOrder.getTenantId(),1));
+                cloudTeacherOrderService.save(cloudTeacherOrder,tenantConfigService.autoActivationFlag(cloudTeacherOrder.getTenantId(),activity.getGiveMemberRankId()));
 
                 Map<Integer, String> phoneMaps = MapUtil.convertMybatisMap(teacherDao.queryPhoneByIds(userId.toString()));
                 String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);

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

@@ -742,7 +742,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
                 //获取云教练溢出费用
                 if (CollectionUtils.isNotEmpty(calenderMembers)) {
                     for (MusicGroupPaymentCalenderMember calenderMember : calenderMembers) {
-                        BigDecimal courseIncome = memberFeeSettingService.getAmount(musicGroup.getOrganId(), 1, calenderMember.getPeriod(),
+                        BigDecimal courseIncome = memberFeeSettingService.getAmount(musicGroup.getOrganId(), calenderMember.getMemberRankSettingId(), calenderMember.getPeriod(),
                                 calenderMember.getNum(), MemberFeeSettingServiceImpl::getIncome);
                         if(calenderMember.getActualAmount().compareTo(courseIncome) > 0){
                             BigDecimal subtract = calenderMember.getActualAmount().subtract(courseIncome);
@@ -846,7 +846,7 @@ public class StudentPaymentOrderDetailServiceImpl extends BaseServiceImpl<Long,
             if(musicGroup.getCourseViewType() == CourseViewTypeEnum.MEMBER_FEE){
                 //获取云教练溢出费用
                 for (MusicGroupPaymentCalenderMember calenderMember : calenderMembers) {
-                    BigDecimal courseIncome = memberFeeSettingService.getAmount(musicGroup.getOrganId(), 1, calenderMember.getPeriod(),
+                    BigDecimal courseIncome = memberFeeSettingService.getAmount(musicGroup.getOrganId(), calenderMember.getMemberRankSettingId(), calenderMember.getPeriod(),
                             calenderMember.getNum(), MemberFeeSettingServiceImpl::getIncome);
                     if(calenderMember.getActualAmount().compareTo(courseIncome) > 0){
                         BigDecimal subtract = calenderMember.getActualAmount().subtract(courseIncome);

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

@@ -155,7 +155,22 @@
     </select>
 
 	<select id="getByIdsAndType" resultMap="MemberRankSetting">
-        SELECT distinct mrs.* FROM member_rank_setting mrs
+        SELECT mrs.id_
+             , mrs.parent_id_
+             , mrs.name_
+             , mrs.intro_
+             , mrs.icon_
+             , mrs.experience_icon_
+             , mrs.create_time_
+             , mrs.update_time_
+             , mrs.operator_
+        <if test="type !=null and type == 'MUSIC'">
+            , sum(if(mrcm.category_id_ = #{typeId},1,0)) is_default_
+        </if>
+        <if test="type !=null and type == 'LESSON'">
+            , sum(if(mrctm.course_type_ = #{typeId},1,0)) is_default_
+        </if>
+        FROM member_rank_setting mrs
         <if test="type !=null and type == 'MUSIC'">
             left join member_rank_category_mapper mrcm on mrs.id_ = mrcm.rank_id_
         </if>
@@ -166,11 +181,6 @@
         <foreach collection="memberIds" item="id" open="(" close=")" separator=",">
             #{id}
         </foreach>
-        <if test="type !=null and type == 'MUSIC'">
-            and mrcm.category_id_ = #{typeId}
-        </if>
-        <if test="type !=null and type == 'LESSON'">
-            and mrctm.course_type_ = #{typeId}
-        </if>
+        group by mrs.id_
     </select>
 </mapper>