Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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/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/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/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

@@ -68,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);
@@ -86,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);
 			}
 		}
 
@@ -487,19 +493,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);
 			}
 		}
 		

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="courseCurrentPrice"/>
-            <result column="course_original_price_" property="courseOriginalPrice"/>
-        </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-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("/getSetting")
+    @PreAuthorize("@pcs.hasPermissions('musicGroupOrganizationCourseSettingsDetail/queryByMusicGroupOrganizationCourseSettingsId')")
+    public HttpResponseResult<List<MusicGroupOrganizationCourseSettingsDetail>> queryByMusicGroupOrganizationCourseSettingsId(Integer id) {
+        return succeed(musicGroupOrganizationCourseSettingsDetailService.queryByMusicGroupOrganizationCourseSettingsId(id));
+    }
+}