Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupOrganizationCourseSettingsDao.java

@@ -2,17 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.entity.MusicGroupOrganizationCourseSettings;
 import com.ym.mec.common.dal.BaseDAO;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 public interface MusicGroupOrganizationCourseSettingsDao extends BaseDAO<Integer, MusicGroupOrganizationCourseSettings> {
 
-    /**
-     * 获取设置详情
-     *
-     * @param id
-     * @return
-     */
-    MusicGroupOrganizationCourseSettings getSetting(@Param("id") Integer id);
 }

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

@@ -75,6 +75,25 @@ public class MusicGroupPaymentCalenderAuditDto {
     @ApiModelProperty(value = "缴费截止日期",required = false)
     private String deadlinePaymentDate;
 
+    @ApiModelProperty(value = "是否赠送网管课",required = false)
+    private Boolean isGiveMusicNetwork;
+
+    public Boolean getIsGiveMusicNetwork() {
+        return isGiveMusicNetwork;
+    }
+
+    public void setIsGiveMusicNetwork(Boolean giveMusicNetwork) {
+        isGiveMusicNetwork = giveMusicNetwork;
+    }
+
+    public Boolean getGiveMusicNetwork() {
+        return isGiveMusicNetwork;
+    }
+
+    public void setGiveMusicNetwork(Boolean giveMusicNetwork) {
+        isGiveMusicNetwork = giveMusicNetwork;
+    }
+
     public BigDecimal getPaymentAmount() {
         return paymentAmount;
     }

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/MusicGroupStatusEnum.java

@@ -3,7 +3,7 @@ package com.ym.mec.biz.dal.enums;
 import com.ym.mec.common.enums.BaseEnum;
 
 public enum MusicGroupStatusEnum implements BaseEnum<String, MusicGroupStatusEnum> {
-	DRAFT("DRAFT", "草稿"), AUDIT("AUDIT", "审核中"),
+	DRAFT("DRAFT", "草稿"), FEE_AUDIT("FEE_AUDIT","费用审核中"), AUDIT("AUDIT", "审核中"),
 	AUDIT_FAILED("AUDIT_FAILED", "审核失败"), APPLY("APPLY", "报名中"),
 	PAY("PAY", "缴费中"), PREPARE("PREPARE", "筹备中"),
 	PROGRESS("PROGRESS", "进行中"), CANCELED("CANCELED", "取消"), PAUSE("PAUSE", "暂停");

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ChargeTypeSubjectMapperQueryInfo.java

@@ -0,0 +1,27 @@
+package com.ym.mec.biz.dal.page;
+
+import com.ym.mec.common.page.QueryInfo;
+
+public class ChargeTypeSubjectMapperQueryInfo extends QueryInfo {
+
+	private Integer chargeTypeId;
+
+	/**  */
+	private Integer subjectId;
+
+	public Integer getChargeTypeId() {
+		return chargeTypeId;
+	}
+
+	public void setChargeTypeId(Integer chargeTypeId) {
+		this.chargeTypeId = chargeTypeId;
+	}
+
+	public Integer getSubjectId() {
+		return subjectId;
+	}
+
+	public void setSubjectId(Integer subjectId) {
+		this.subjectId = subjectId;
+	}
+}

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

@@ -1,9 +1,11 @@
 package com.ym.mec.biz.service;
 
+import java.util.List;
+
 import com.ym.mec.biz.dal.entity.MusicGroupOrganizationCourseSettingsDetail;
 import com.ym.mec.common.service.BaseService;
 
 public interface MusicGroupOrganizationCourseSettingsDetailService extends BaseService<Integer, MusicGroupOrganizationCourseSettingsDetail> {
 
-
+	List<MusicGroupOrganizationCourseSettingsDetail> queryByMusicGroupOrganizationCourseSettingsId(Integer musicGroupOrganizationCourseSettingsId);
 }

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

@@ -29,11 +29,4 @@ public interface MusicGroupOrganizationCourseSettingsService extends BaseService
      */
     MusicGroupOrganizationCourseSettings updateSetting(MusicGroupOrganizationCourseSettings setting);
 
-
-    /**
-     * 获取收费设置详情
-     * @param id
-     * @return
-     */
-    MusicGroupOrganizationCourseSettings getSetting(Integer id);
 }

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

@@ -200,6 +200,10 @@ public interface SysConfigService extends BaseService<Long, SysConfig> {
     String HOLIDAY_SETTING = "holiday_setting";
 
     String PRACTICE_FREE_APPLY_EXPIRE_DATE = "practice_free_apply_expire_date";
+    
+    String START_TIME_OF_1111 = "start_time_of_1111";
+    
+    String END_TIME_OF_1111 = "end_time_of_1111";
 
     /**
      * @return com.ym.mec.biz.dal.entity.SysConfig

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

@@ -1,15 +1,15 @@
 package com.ym.mec.biz.service.impl;
 
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
 import com.ym.mec.biz.dal.dao.MusicGroupOrganizationCourseSettingsDetailDao;
-import com.ym.mec.biz.dal.dao.MusicGroupPaymentCalenderDetailDao;
 import com.ym.mec.biz.dal.entity.MusicGroupOrganizationCourseSettingsDetail;
-import com.ym.mec.biz.dal.entity.MusicGroupPurchaseList;
 import com.ym.mec.biz.service.MusicGroupOrganizationCourseSettingsDetailService;
 import com.ym.mec.common.dal.BaseDAO;
-import com.ym.mec.common.service.BaseService;
 import com.ym.mec.common.service.impl.BaseServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 
 @Service
 public class MusicGroupOrganizationCourseSettingsDetailServiceImpl extends BaseServiceImpl<Integer, MusicGroupOrganizationCourseSettingsDetail> implements MusicGroupOrganizationCourseSettingsDetailService {
@@ -21,4 +21,9 @@ public class MusicGroupOrganizationCourseSettingsDetailServiceImpl extends BaseS
         return musicGroupOrganizationCourseSettingsDetailDao;
     }
 
+	@Override
+	public List<MusicGroupOrganizationCourseSettingsDetail> queryByMusicGroupOrganizationCourseSettingsId(Integer musicGroupOrganizationCourseSettingsId) {
+		return musicGroupOrganizationCourseSettingsDetailDao.queryByMusicGroupOrganizationCourseSettingsId(musicGroupOrganizationCourseSettingsId);
+	}
+
 }

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

@@ -33,15 +33,13 @@ public class MusicGroupOrganizationCourseSettingsServiceImpl extends BaseService
             throw new BizException("请设置对应课程的收费");
         }
 
-        for (MusicGroupOrganizationCourseSettingsDetail detail : setting.getDetails()) {
-            if (detail.getCourseTotalMinuties() <= 0) {
-                throw new BizException(detail.getCourseType().getMsg() + "课程总时长必须大于0");
-            }
-            if (detail.getIsStudentOptional()) {
-                setting.setTotalCurrentPrice(setting.getTotalCurrentPrice().add(detail.getCourseCurrentPrice()));
-                setting.setTotalOriginalPrice(setting.getTotalOriginalPrice().add(detail.getCourseOriginalPrice()));
-            }
-        }
+		for (MusicGroupOrganizationCourseSettingsDetail detail : setting.getDetails()) {
+			if (detail.getCourseTotalMinuties() <= 0) {
+				throw new BizException(detail.getCourseType().getMsg() + "课程总时长必须大于0");
+			}
+			setting.setTotalCurrentPrice(setting.getTotalCurrentPrice().add(detail.getCourseCurrentPrice()));
+			setting.setTotalOriginalPrice(setting.getTotalOriginalPrice().add(detail.getCourseOriginalPrice()));
+		}
         musicGroupOrganizationCourseSettingsDao.insert(setting);
         for (MusicGroupOrganizationCourseSettingsDetail detail : setting.getDetails()) {
             detail.setMusicGroupOrganizationCourseSettingsId(setting.getId());
@@ -70,15 +68,13 @@ public class MusicGroupOrganizationCourseSettingsServiceImpl extends BaseService
         }
         musicGroupOrganizationCourseSettingsDetailDao.deleteBySettingId(setting.getId());
 
-        for (MusicGroupOrganizationCourseSettingsDetail detail : setting.getDetails()) {
-            if (detail.getCourseTotalMinuties() <= 0) {
-                throw new BizException(detail.getCourseType().getMsg() + "课程总时长必须大于0");
-            }
-            if (detail.getIsStudentOptional()) {
-                setting.setTotalCurrentPrice(setting.getTotalCurrentPrice().add(detail.getCourseCurrentPrice()));
-                setting.setTotalOriginalPrice(setting.getTotalOriginalPrice().add(detail.getCourseOriginalPrice()));
-            }
-        }
+		for (MusicGroupOrganizationCourseSettingsDetail detail : setting.getDetails()) {
+			if (detail.getCourseTotalMinuties() <= 0) {
+				throw new BizException(detail.getCourseType().getMsg() + "课程总时长必须大于0");
+			}
+			setting.setTotalCurrentPrice(setting.getTotalCurrentPrice().add(detail.getCourseCurrentPrice()));
+			setting.setTotalOriginalPrice(setting.getTotalOriginalPrice().add(detail.getCourseOriginalPrice()));
+		}
         musicGroupOrganizationCourseSettingsDao.update(setting);
         for (MusicGroupOrganizationCourseSettingsDetail detail : setting.getDetails()) {
             detail.setId(null);
@@ -88,9 +84,4 @@ public class MusicGroupOrganizationCourseSettingsServiceImpl extends BaseService
         musicGroupOrganizationCourseSettingsDetailDao.batchInsert(setting.getDetails());
         return setting;
     }
-
-    @Override
-    public MusicGroupOrganizationCourseSettings getSetting(Integer id) {
-        return musicGroupOrganizationCourseSettingsDao.getSetting(id);
-    }
 }

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

@@ -276,20 +276,26 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 					}
 				}
 			}
+		}
 
-			// 如果是报名，需要修改乐团状态
-			if (musicGroupPaymentCalender.getPaymentType() == MUSIC_APPLY) {
-				int countAuditReject = musicGroupPaymentCalenderDao.countAuditReject(musicGroupPaymentCalender.getMusicGroupId(),null);
-				if(countAuditReject == 0){
-					if (musicGroup.getStatus() != MusicGroupStatusEnum.DRAFT) {
-						throw new BizException("创建失败：缴费项目类型不匹配");
-					}
+		// 如果是报名，需要修改乐团状态
+		if (musicGroupPaymentCalender.getPaymentType() == MUSIC_APPLY) {
+			int countAuditReject = musicGroupPaymentCalenderDao.countAuditReject(musicGroupPaymentCalender.getMusicGroupId(),null);
+			if(countAuditReject == 0){
+				if (musicGroup.getStatus() != MusicGroupStatusEnum.DRAFT) {
+					throw new BizException("创建失败：缴费项目类型不匹配");
+				}
+				if(musicGroupPaymentCalender.getStatus() != PaymentCalenderStatusEnum.AUDITING){
 					musicGroup.setStatus(MusicGroupStatusEnum.AUDIT);
-					musicGroup.setUpdateTime(date);
 					// 记录操作日志
-					musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（草稿 -> 审核中）", sysUser.getId(), ""));
-					musicGroupDao.update(musicGroup);
+					musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（草稿 -> 基础信息审核中）", sysUser.getId(), ""));
+				}else{
+					musicGroup.setStatus(MusicGroupStatusEnum.FEE_AUDIT);
+					// 记录操作日志
+					musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（草稿 -> 费用审核中）", sysUser.getId(), ""));
 				}
+				musicGroup.setUpdateTime(date);
+				musicGroupDao.update(musicGroup);
 			}
 		}
 
@@ -373,8 +379,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		}
 		
 		//获取设置的课程
-		List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList = musicGroupPaymentCalender
-				.getMusicGroupPaymentCalenderCourseSettingsList();
+		List<MusicGroupPaymentCalenderCourseSettings> musicGroupPaymentCalenderCourseSettingsList = musicGroupPaymentCalender.getMusicGroupPaymentCalenderCourseSettingsList();
 		if (musicGroupPaymentCalenderCourseSettingsList == null) {
 			musicGroupPaymentCalenderCourseSettingsList = new ArrayList<>();
 		}
@@ -487,19 +492,26 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 				}
 			}
 
-			// 如果是报名，需要修改乐团状态
-			if (musicGroupPaymentCalender.getPaymentType() == MUSIC_APPLY) {
-				int countAuditReject = musicGroupPaymentCalenderDao.countAuditReject(musicGroupPaymentCalender.getMusicGroupId(),musicGroupPaymentCalender.getId());
-				if(countAuditReject == 0){
-					if (musicGroup.getStatus() != MusicGroupStatusEnum.DRAFT) {
-						throw new BizException("创建失败：缴费项目类型不匹配");
-					}
+		}
+
+		// 如果是报名，需要修改乐团状态
+		if (musicGroupPaymentCalender.getPaymentType() == MUSIC_APPLY) {
+			int countAuditReject = musicGroupPaymentCalenderDao.countAuditReject(musicGroupPaymentCalender.getMusicGroupId(),null);
+			if(countAuditReject == 0){
+				if (musicGroup.getStatus() != MusicGroupStatusEnum.DRAFT) {
+					throw new BizException("创建失败：缴费项目类型不匹配");
+				}
+				if(musicGroupPaymentCalender.getStatus() != PaymentCalenderStatusEnum.AUDITING){
 					musicGroup.setStatus(MusicGroupStatusEnum.AUDIT);
-					musicGroup.setUpdateTime(date);
 					// 记录操作日志
-					musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（草稿 -> 审核中）", sysUser.getId(), ""));
-					musicGroupDao.update(musicGroup);
+					musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（草稿 -> 基础信息审核中）", sysUser.getId(), ""));
+				}else{
+					musicGroup.setStatus(MusicGroupStatusEnum.FEE_AUDIT);
+					// 记录操作日志
+					musicGroupBuildLogDao.insert(new MusicGroupBuildLog(musicGroupId, "报名缴费项目创建成功（草稿 -> 费用审核中）", sysUser.getId(), ""));
 				}
+				musicGroup.setUpdateTime(date);
+				musicGroupDao.update(musicGroup);
 			}
 		}
 		
@@ -508,6 +520,14 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		musicGroupPaymentCalenderCourseSettingsDao.deleteByMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
 		
 		if(musicGroupPaymentCalenderCourseSettingsList.size() > 0){
+			MusicGroupOrganizationCourseSettings courseSettings = musicGroupOrganizationCourseSettingsDao.get(musicGroupPaymentCalender
+					.getMusicGroupOrganizationCourseSettingId());
+			for (MusicGroupPaymentCalenderCourseSettings musicGroupPaymentCalenderCourseSettings : musicGroupPaymentCalenderCourseSettingsList) {
+				musicGroupPaymentCalenderCourseSettings.setMusicGroupPaymentCalenderId(musicGroupPaymentCalender.getId());
+				if (courseSettings != null) {
+					musicGroupPaymentCalenderCourseSettings.setName(courseSettings.getName());
+				}
+			}
 			musicGroupPaymentCalenderCourseSettingsDao.batchInsert(musicGroupPaymentCalenderCourseSettingsList);
 		}
 		
@@ -553,6 +573,7 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
 		List<CalenderPushDto> calenderPushDtos = musicGroupPaymentCalenderDao.getMusicCalenderPushDto(configValue1, format);
 		if (calenderPushDtos != null && calenderPushDtos.size() > 0) {
 			calenderPushDtos.forEach(e -> {
+
 				Map<Integer, String> receivers = new HashMap<>(1);
 				receivers.put(e.getTeacherId(), e.getTeacherPhone());
 				sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.AWSMS, MessageTypeEnum.SMS_PAYMENT_CREATE, receivers, null, 0,

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

@@ -161,6 +161,8 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     private SimpleDateFormat sdf_ymd = new SimpleDateFormat("yyyy-MM-dd");
 
     private SimpleDateFormat sdf_hms = new SimpleDateFormat("HH:mm:ss");
+    
+    private SimpleDateFormat sdf_ymdhms = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 
     @Override
     public BaseDAO<String, MusicGroup> getDAO() {
@@ -304,16 +306,29 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         }
         if (chargeInfo.getMaxAmount() != null) {
             if (chargeInfo.getOpenMaxTerm().equals(YesOrNoEnum.YES) && chargeInfo.getMaxAmount().compareTo(chargeInfo.getPaidAmount()) <= 0) {
-                throw new Exception("活动人数暂时已满，请稍后再试");
+                throw new Exception("活动名额已满，谢谢您的支持！");
             }
             if (chargeInfo.getOpenMaxTerm().equals(YesOrNoEnum.YES) && chargeInfo.getMaxAmount().compareTo(chargeInfo.getPaidAmount().add(amount)) < 0) {
-                throw new Exception("活动数量暂时已满，请调整数量或稍后再试");
+                throw new Exception("活动名额已满，谢谢您的支持！");
             }
         }
 
+        Date date = new Date();
+        
         OrderTypeEnum type = OrderTypeEnum.SPORADIC;
         if (chargeInfo.getChargeType().equals(SporadicChargeTypeEnum.DOUBLE_ELEVEN2020)) {
             type = OrderTypeEnum.DOUBLE_ELEVEN2020;
+            
+            String startTimeStr = sysConfigDao.findConfigValue(SysConfigService.START_TIME_OF_1111);
+            String endTimeStr = sysConfigDao.findConfigValue(SysConfigService.END_TIME_OF_1111);
+            Date startTime = sdf_ymdhms.parse(startTimeStr);
+            Date endTime = sdf_ymdhms.parse(endTimeStr);
+            if(date.before(startTime)){
+            	throw new Exception("活动暂未开始，请您耐心等待！");
+            }
+            if(date.after(endTime)){
+            	throw new Exception("活动已结束，谢谢您的支持！");
+            }
         }
 
         Integer userId = sporadicPayDto.getUserId();
@@ -332,7 +347,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         studentPaymentOrderService.insert(studentPaymentOrder);
 
         studentPaymentOrder.setVersion(0);
-        Date date = new Date();
         BigDecimal balance = BigDecimal.ZERO;
         if (sporadicPayDto.getUseBalancePayment() && amount.compareTo(BigDecimal.ZERO) > 0) {
             if (chargeInfo.getChargeType().getCode().equals(9)) {

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

@@ -130,14 +130,30 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="ChargeTypeSubjectMapper" parameterType="map">
-        SELECT * FROM charge_type_subject_mapper ORDER BY id_
+        SELECT * FROM charge_type_subject_mapper 
+        <where>
+        	<if test="chargeTypeId != null">
+        		charge_type_id_ = #{chargeTypeId}
+        	</if>
+        	<if test="subjectId != null">
+        		subject_id_ = #{subjectId}
+        	</if>
+        </where>
+        ORDER BY id_ desc
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-        SELECT COUNT(*)
-        FROM charge_type_subject_mapper
+        SELECT COUNT(*) FROM charge_type_subject_mapper
+        <where>
+        	<if test="chargeTypeId != null">
+        		charge_type_id_ = #{chargeTypeId}
+        	</if>
+        	<if test="subjectId != null">
+        		subject_id_ = #{subjectId}
+        	</if>
+        </where>
     </select>
 
     <!-- 根据收费类型获取乐团乐器折扣 -->

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

@@ -13,17 +13,6 @@
         <result column="total_original_price_" property="totalOriginalPrice"/>
         <result column="create_time_" property="createTime"/>
         <result column="update_time_" property="updateTime"/>
-        <collection property="details" ofType="com.ym.mec.biz.dal.entity.MusicGroupOrganizationCourseSettingsDetail"
-                    columnPrefix="detail_">
-            <result column="id_" property="id"/>
-            <result column="course_type_" property="courseType"
-                    typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-            <result column="is_student_optional_" property="isStudentOptional"/>
-            <result column="course_total_minuties_" property="courseTotalMinuties"/>
-            <result column="unit_price_" property="unitPrice"/>
-            <result column="course_current_price_" property="courseOriginalPrice"/>
-            <result column="course_original_price_" property="courseCurrentPrice"/>
-        </collection>
     </resultMap>
     <sql id="Base_Column_List">
         <!--@mbg.generated-->
@@ -82,24 +71,14 @@
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="MusicGroupOrganizationCourseSettings" parameterType="map">
-        SELECT mgocs.*,mgocsd.id_ detail_id_,mgocsd.course_type_ detail_course_type_, mgocsd.is_student_optional_
-        detail_is_student_optional_,mgocsd.course_total_minuties_ detail_course_total_minuties_,
-        mgocsd.unit_price_ detail_unit_price_,mgocsd.course_current_price_ detail_course_current_price_,
-        mgocsd.course_original_price_ detail_course_original_price_,mgocsd.course_current_price_
-        detail_course_current_price_
-        FROM music_group_organization_course_settings mgocs
-        LEFT JOIN music_group_organization_course_settings_detail mgocsd ON mgocs.id_ =
-        mgocsd.music_group_organization_course_settings_id_
+        SELECT mgocs.* FROM music_group_organization_course_settings mgocs
         <include refid="queryCondition"/>
         <include refid="global.limit"/>
     </select>
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-        SELECT COUNT(*)
-        FROM music_group_organization_course_settings mgocs
-        LEFT JOIN music_group_organization_course_settings_detail mgocsd
-        ON mgocs.id_ = mgocsd.music_group_organization_course_settings_id_
+        SELECT COUNT(mgocs.id_) FROM music_group_organization_course_settings mgocs
         <include refid="queryCondition"/>
     </select>
 
@@ -114,20 +93,4 @@
         </where>
     </sql>
 
-    <select id="getSetting" resultMap="MusicGroupOrganizationCourseSettings">
-        SELECT mgocs.*,
-               mgocsd.id_                    detail_id_,
-               mgocsd.course_type_           detail_course_type_,
-               mgocsd.is_student_optional_   detail_is_student_optional_,
-               mgocsd.course_total_minuties_ detail_course_total_minuties_,
-               mgocsd.unit_price_            detail_unit_price_,
-               mgocsd.course_current_price_  detail_course_current_price_,
-               mgocsd.course_original_price_ detail_course_original_price_,
-               mgocsd.course_current_price_  detail_course_current_price_
-        FROM music_group_organization_course_settings mgocs
-                 LEFT JOIN music_group_organization_course_settings_detail mgocsd
-                           ON mgocs.id_ = mgocsd.music_group_organization_course_settings_id_
-        WHERE mgocs.id_ = #{id}
-    </select>
-
 </mapper>

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

@@ -399,6 +399,7 @@
         <result property="deadlinePaymentDate" column="deadline_payment_date_"/>
         <result property="auditMemo" column="audit_memo_"/>
         <result property="paymentAmount" column="payment_amount_"/>
+        <result property="isGiveMusicNetwork" column="is_give_music_network_"/>
     </resultMap>
     <sql id="MusicGroupPaymentCalenderAuditDtoSql">
         <where>
@@ -451,7 +452,7 @@
         mgpc.pay_user_type_,mgpc.memo_,mgpc.status_,SUM(mgpccs.course_total_minuties_) course_total_minuties_,
         SUM(mgpccs.course_original_price_) course_original_price_,SUM(mgpccs.course_current_price_) course_current_price_,
         MAX(mg.name_) music_group_name_,MAX(mg.organ_id_) organ_id_,MAX(mgpccs.name_) calender_settings_name_,mgpc.payment_pattern_,mgpc.payment_valid_start_date_,
-        mgpc.payment_valid_end_date_,mgpc.start_payment_date_,mgpc.deadline_payment_date_,mgpc.audit_memo_,mgpc.payment_amount_
+        mgpc.payment_valid_end_date_,mgpc.start_payment_date_,mgpc.deadline_payment_date_,mgpc.audit_memo_,mgpc.payment_amount_,mgpc.is_give_music_network_
         FROM music_group_payment_calender mgpc
         LEFT JOIN music_group mg ON mg.id_ = mgpc.music_group_id_
         LEFT JOIN music_group_payment_calender_course_settings mgpccs ON mgpc.id_ = mgpccs.music_group_payment_calender_id_

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupController.java

@@ -189,7 +189,7 @@ public class MusicGroupController extends BaseController {
         MusicGroupPaymentCalenderDetail userLastCalenderDetail = musicGroupPaymentCalenderDetailDao.getUserLastCalenderDetail(musicGroupId, userId);
         if (userLastCalenderDetail == null) {
             MusicGroupPaymentCalender lastCalender = musicGroupPaymentCalenderDao.getLastStartOne(musicGroupId);
-            String tips = (lastCalender != null && lastCalender.getStatus() == PaymentCalenderStatusEnum.OVER) ? "当前续费时间已截止,如有问题请联系指导老师" : "当前续费未开始,如有问题请联系指导老师";
+            String tips = (lastCalender != null && lastCalender.getStatus() == PaymentCalenderStatusEnum.OVER) ? "缴费已截止,如有问题请联系指导老师" : "缴费暂未开始,如有问题请联系指导老师";
             throw new BizException(tips);
         }
 
@@ -236,18 +236,18 @@ public class MusicGroupController extends BaseController {
             throw new BizException("缴费项不存在该学员，请联系教务老师");
         }
         if(calenderDetail.getPaymentStatus() == PaymentStatus.PAID_COMPLETED){
-            throw new BizException("您已缴费请勿重复支付");
+            throw new BizException("您已缴费，请勿重复提交");
         }else if(calenderDetail.getPaymentStatus() == PaymentStatus.PROCESSING){
-            throw new BizException("当前缴费项存在待处理的订单，请稍候尝试");
+            throw new BizException("存在待处理的订单，请稍候尝试");
         }
         //缴费项目已开启或者单独开启
         Map renew;
         if(calender.getStatus() == PaymentCalenderStatusEnum.OPEN || calenderDetail.getOpen() == 1){
             renew = musicGroupService.renew(calenderId, userId, isUseBalancePayment);
         }else if(calender.getStatus() == PaymentCalenderStatusEnum.OVER){
-            throw new BizException("当前缴费项时间已截止,如有问题请联系指导老师");
+            throw new BizException("缴费已截止,如有问题请联系指导老师");
         }else {
-            throw new BizException("当前缴费项未开始,如有问题请联系指导老师");
+            throw new BizException("缴费暂未开始,如有问题请联系指导老师");
         }
         if (renew.containsKey("tradeState")) {
             return failed(HttpStatus.CREATED, "恭喜您,缴费成功!");

mec-student/src/main/java/com/ym/mec/student/controller/MusicGroupPaymentCalenderController.java

@@ -64,7 +64,7 @@ public class MusicGroupPaymentCalenderController extends BaseController {
         if(calenderDetail.getPaymentStatus() == PaymentStatus.PAID_COMPLETED){
             throw new BizException("您已缴费，请勿重复提交");
         }else if(calenderDetail.getPaymentStatus() == PaymentStatus.PROCESSING){
-            throw new BizException("当前缴费项存在待处理的订单，请稍候尝试");
+            throw new BizException("存在待处理的订单，请稍候尝试");
         }
         if(calender.getStatus() == PaymentCalenderStatusEnum.OPEN){
             StudentRegistration studentRegistration = studentRegistrationService.queryByUserIdAndMusicGroupId(userId,musicGroupId);
@@ -79,9 +79,9 @@ public class MusicGroupPaymentCalenderController extends BaseController {
             model.put("balance",studentRegistration.getBalance());
             return succeed(model);
         }else if(calender.getStatus() == PaymentCalenderStatusEnum.OVER){
-            throw new BizException("当前缴费项时间已截止,如有问题请联系指导老师");
+            throw new BizException("缴费已截止,如有问题请联系指导老师");
         }else {
-            throw new BizException("当前缴费项未开始,如有问题请联系指导老师");
+            throw new BizException("缴费暂未开始,如有问题请联系指导老师");
         }
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/ChargeTypeSubjectMapperController.java

@@ -1,11 +1,11 @@
 package com.ym.mec.web.controller;
 
-import java.util.List;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -17,9 +17,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.ym.mec.biz.dal.entity.ChargeTypeSubjectMapper;
+import com.ym.mec.biz.dal.page.ChargeTypeSubjectMapperQueryInfo;
 import com.ym.mec.biz.service.ChargeTypeSubjectMapperService;
 import com.ym.mec.common.controller.BaseController;
-import com.ym.mec.common.page.QueryInfo;
 
 @RequestMapping("chargeTypeSubjectMapper")
 @Api(tags = "收费类型与科目的关联服务")
@@ -32,7 +32,7 @@ public class ChargeTypeSubjectMapperController extends BaseController {
     @ApiOperation(value = "分页查询收费类型列表")
     @GetMapping(value = "/queryPage", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @PreAuthorize("@pcs.hasPermissions('chargeTypeSubjectMapper/queryPage')")
-    public Object queryPage(QueryInfo queryInfo) {
+    public Object queryPage(ChargeTypeSubjectMapperQueryInfo queryInfo) {
         return succeed(chargeTypeSubjectMapperService.queryPage(queryInfo));
     }
 

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupOrganizationCourseSettingsController.java

@@ -1,17 +1,22 @@
 package com.ym.mec.web.controller;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.ym.mec.biz.dal.entity.MusicGroupOrganizationCourseSettings;
 import com.ym.mec.biz.dal.page.CourseSettingQueryInfo;
-import com.ym.mec.biz.dal.page.HfMemberQueryInfo;
 import com.ym.mec.biz.service.MusicGroupOrganizationCourseSettingsService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("musicGroupOrganizationCourseSettings")
 @Api(tags = "收费方式设置")
@@ -48,10 +53,4 @@ public class MusicGroupOrganizationCourseSettingsController extends BaseControll
         return succeed(musicGroupOrganizationCourseSettingsService.updateSetting(musicGroupOrganizationCourseSettings));
     }
 
-    @ApiOperation(value = "获取收费设置详情")
-    @GetMapping("/getSetting")
-    @PreAuthorize("@pcs.hasPermissions('musicGroupOrganizationCourseSettings/getSetting')")
-    public HttpResponseResult<MusicGroupOrganizationCourseSettings> getSetting(Integer id) {
-        return succeed(musicGroupOrganizationCourseSettingsService.getSetting(id));
-    }
 }

mec-web/src/main/java/com/ym/mec/web/controller/MusicGroupOrganizationCourseSettingsDetailController.java

@@ -0,0 +1,32 @@
+package com.ym.mec.web.controller;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.ym.mec.biz.dal.entity.MusicGroupOrganizationCourseSettingsDetail;
+import com.ym.mec.biz.service.MusicGroupOrganizationCourseSettingsDetailService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.entity.HttpResponseResult;
+
+@RequestMapping("musicGroupOrganizationCourseSettingsDetail")
+@Api(tags = "收费方式对应的课程明细")
+@RestController
+public class MusicGroupOrganizationCourseSettingsDetailController extends BaseController {
+    @Autowired
+    private MusicGroupOrganizationCourseSettingsDetailService musicGroupOrganizationCourseSettingsDetailService;
+
+    @ApiOperation(value = "获取收费设置详情")
+    @GetMapping("/queryByMusicGroupOrganizationCourseSettingsId")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupOrganizationCourseSettingsDetail/queryByMusicGroupOrganizationCourseSettingsId')")
+    public HttpResponseResult<List<MusicGroupOrganizationCourseSettingsDetail>> queryByMusicGroupOrganizationCourseSettingsId(Integer id) {
+        return succeed(musicGroupOrganizationCourseSettingsDetailService.queryByMusicGroupOrganizationCourseSettingsId(id));
+    }
+}

mec-web/src/main/java/com/ym/mec/web/controller/education/ActivityController.java

@@ -10,14 +10,17 @@ import com.ym.mec.biz.dal.dto.OrganMaxAmountDto;
 import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Comparator;
 import java.util.List;
 import java.util.Set;
@@ -63,7 +66,7 @@ public class ActivityController extends BaseController {
         for (OrderStatisDto order : orders) {
             for (OrganMaxAmountDto maxAmount4Organ : maxAmount4Organs) {
                 if (order.getOrganId().equals(maxAmount4Organ.getId())) {
-                    order.setMaxAmount(maxAmount4Organ.getMaxAmount() == null ? BigDecimal.ZERO.setScale(2) : maxAmount4Organ.getMaxAmount().setScale(2));
+                    order.setMaxAmount(maxAmount4Organ.getMaxAmount() == null ? BigDecimal.ZERO.setScale(2,RoundingMode.HALF_UP) : maxAmount4Organ.getMaxAmount().setScale(2,RoundingMode.HALF_UP));
                     break;
                 }
             }