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

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

@@ -63,6 +63,13 @@ public class SporadicChargeInfo {
 	@ApiModelProperty(value = "所属乐团名称", required = true)
 	private String musicGroupName;
 
+	@ApiModelProperty(value = "缴费最大人数", required = true)
+	private Integer maxNum;
+
+	private Integer paidNum;
+
+	private Integer version;
+
 	public String getMusicGroupName() {
 		return musicGroupName;
 	}
@@ -230,4 +237,28 @@ public class SporadicChargeInfo {
 	public void setOrderType(String orderType) {
 		this.orderType = orderType;
 	}
+
+	public Integer getMaxNum() {
+		return maxNum;
+	}
+
+	public void setMaxNum(Integer maxNum) {
+		this.maxNum = maxNum;
+	}
+
+	public Integer getPaidNum() {
+		return paidNum;
+	}
+
+	public void setPaidNum(Integer paidNum) {
+		this.paidNum = paidNum;
+	}
+
+	public Integer getVersion() {
+		return version;
+	}
+
+	public void setVersion(Integer version) {
+		this.version = version;
+	}
 }

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

@@ -54,4 +54,15 @@ public interface CourseScheduleStudentPaymentService extends BaseService<Long, C
 	 */
 	void updateVipGiveCourse(Long vipGroupId);
 
+	/**
+	 * @describe 创建课程缴费记录-乐团
+	 * @author Joburgess
+	 * @date 2020.10.27
+	 * @param musicGroupId: 乐团编号
+	 * @param courseSchedules: 课程计划列表
+	 * @param studentIds: 课程学员列表
+	 * @return void
+	 */
+	void createForMusicGroup(String musicGroupId, List<CourseSchedule> courseSchedules, List<Integer> studentIds);
+
 }

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

@@ -264,4 +264,9 @@ public class CourseScheduleStudentPaymentServiceImpl extends BaseServiceImpl<Lon
 			courseScheduleStudentPaymentDao.batchUpdate(needUpdatePayments);
 		}
 	}
+
+	@Override
+	public void createForMusicGroup(String musicGroupId, List<CourseSchedule> courseSchedules, List<Integer> studentIds) {
+
+	}
 }

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

@@ -393,6 +393,26 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         if (!(amount.compareTo(sporadicPayDto.getAmount()) == 0)) {
             throw new BizException("订单金额异常");
         }
+        if (chargeInfo.getMaxNum() != null) {
+            //重试避免人数过多频繁冲突
+            boolean flag = false;
+            for (int i = 1; i <= 10; i++) {
+                chargeInfo = sporadicChargeInfoDao.get(sporadicPayDto.getSporadicId());
+                if (chargeInfo.getMaxNum() >= chargeInfo.getPaidNum()) {
+                    throw new BizException("活动人数暂时已满，请稍后再试");
+                }
+                chargeInfo.setPaidNum(chargeInfo.getPaidNum() + 1);
+                chargeInfo.setUpdateTime(new Date());
+                int update = sporadicChargeInfoDao.update(chargeInfo);
+                if (update > 0) {
+                    flag = true;
+                    break;
+                }
+            }
+            if (!flag) {
+                throw new BizException("活动火爆，请稍后再试");
+            }
+        }
 
         OrderTypeEnum type = OrderTypeEnum.SPORADIC;
         if(chargeInfo.getChargeType().equals(SporadicChargeTypeEnum.DOUBLE_ELEVEN2020)){

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

@@ -54,7 +54,7 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
     @Autowired
     private ContractService contractService;
 
-    private final Logger logger= LoggerFactory.getLogger(this.getClass());
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Override
     public BaseDAO<Integer, SporadicChargeInfo> getDAO() {
@@ -89,7 +89,7 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
             } else if (info.getChargeType().getCode() == 9) { //零星收费账户充值
                 sysUserCashAccountService.updateBalance(userId, studentPaymentOrder.getActualAmount(), PlatformCashAccountDetailTypeEnum.RECHARGE, "零星收费账户充值", studentPaymentOrder.getTransNo());
             } else if (info.getOrganId().equals(42) && info.getChargeType().equals(SporadicChargeTypeEnum.LEVEL)) {
-                degreeRegistrationService.updateStatus(studentPaymentOrder.getUserId(), 2,studentPaymentOrder.getOrderNo());
+                degreeRegistrationService.updateStatus(studentPaymentOrder.getUserId(), 2, studentPaymentOrder.getOrderNo());
                 return true;
             } else {
                 //插入交易明细
@@ -139,8 +139,25 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
             return true;
         }
         if (studentPaymentOrder.getStatus() == DealStatusEnum.CLOSE || studentPaymentOrder.getStatus() == DealStatusEnum.FAILED) {
-            if (info.getOrganId().equals(42) && info.getChargeType().equals(SporadicChargeTypeEnum.LEVEL)){
-                degreeRegistrationService.updateStatus(studentPaymentOrder.getUserId(),0,studentPaymentOrder.getOrderNo());
+            if (info.getMaxNum() != null) {
+                //重试避免人数过多频繁冲突
+                boolean flag = false;
+                for (int i = 1; i <= 10; i++) {
+                    info = sporadicChargeInfoDao.get(info.getId());
+                    info.setPaidNum(info.getPaidNum() - 1);
+                    info.setUpdateTime(new Date());
+                    int update = sporadicChargeInfoDao.update(info);
+                    if (update > 0) {
+                        flag = true;
+                        break;
+                    }
+                }
+                if (!flag) {
+                    throw new BizException("活动火爆，请稍后再试");
+                }
+            }
+            if (info.getOrganId().equals(42) && info.getChargeType().equals(SporadicChargeTypeEnum.LEVEL)) {
+                degreeRegistrationService.updateStatus(studentPaymentOrder.getUserId(), 0, studentPaymentOrder.getOrderNo());
                 return true;
             }
 
@@ -213,9 +230,9 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
     @Transactional(rollbackFor = Exception.class)
     public void del(Integer id) {
         Integer count = studentPaymentOrderDao.countSporadicOrder(id);
-        if(count == null || count == 0){
+        if (count == null || count == 0) {
             sporadicChargeInfoDao.delete(id);
-        }else {
+        } else {
             throw new BizException("当前缴费项目存在收费记录，请走关闭流程");
         }
     }
@@ -231,7 +248,7 @@ public class SporadicChargeInfoImpl extends BaseServiceImpl<Integer, SporadicCha
         }
         SporadicChargeInfo chargeInfo = sporadicChargeInfoDao.get(id);
         MusicGroup musicGroup = musicGroupDao.get(chargeInfo.getMusicGroupId());
-        if(musicGroup != null){
+        if (musicGroup != null) {
             chargeInfo.setMusicGroupName(musicGroup.getName());
         }
         if (chargeInfo != null) {

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

@@ -34,7 +34,6 @@
         <result column="repair_user_id_" property="repairUserId"/>
         <result column="ownership_type_" property="ownershipType"
                 typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-        <result column="fee_type_" property="feeType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="del_flag_" property="delFlag"/>
         <result column="payment_valid_start_date_" property="paymentValidStartDate"/>
         <result column="payment_valid_end_date_" property="paymentValidEndDate"/>
@@ -71,7 +70,7 @@
          bill_start_date_, improvent_classes_num_, enroll_classes_, payment_expire_date_, is_extra_class_,
          settlement_type_, cooperation_organ_id_, enlightenment_course_time_,
          parent_meeting_time_, img_, director_user_id_, is_classroom_lessons_, memo_, expect_start_group_date_,
-         ownership_type_, repair_user_id_, fee_type_, del_flag_,payment_valid_start_date_,payment_valid_end_date_,payment_pattern_)
+         ownership_type_, repair_user_id_, del_flag_,payment_valid_start_date_,payment_valid_end_date_,payment_pattern_)
         VALUES (#{id}, #{name}, #{organId}, #{schoolId}, #{applyExpireDate}, #{teamTeacherId}, #{educationalTeacherId},
                 #{chargeTypeId}, #{courseForm}, now(), now(),
                 #{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{billStartDate},
@@ -81,7 +80,7 @@
                 #{cooperationOrganId}, #{enlightenmentCourseTime}, #{parentMeetingTime}, #{img}, #{directorUserId},
                 #{isClassroomLessons}, #{memo}, #{expectStartGroupDate},
                 #{ownershipType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{repairUserId},
-                #{feeType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{delFlag},#{paymentValidStartDate},#{paymentValidEndDate},#{paymentPattern})
+                #{delFlag},#{paymentValidStartDate},#{paymentValidEndDate},#{paymentPattern})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
@@ -98,9 +97,6 @@
             <if test="ownershipType != null">
                 ownership_type_ = #{ownershipType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>
-            <if test="feeType != null">
-                fee_type_ = #{feeType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-            </if>
             <if test="status != null">
                 status_ = #{status, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             </if>

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

@@ -3,143 +3,175 @@
 <!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
 <mapper namespace="com.ym.mec.biz.dal.dao.SporadicChargeInfoDao">
 
-	<resultMap type="com.ym.mec.biz.dal.entity.SporadicChargeInfo" id="SporadicChargeInfo">
-		<result column="id_" property="id" />
-		<result column="title_" property="title" />
-		<result column="charge_type_" property="chargeType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
-		<result column="organ_id_" property="organId"/>
-		<result column="amount_" property="amount" />
-		<result column="discount_amount_" property="discountAmount" />
-		<result column="detail_" property="detail" />
-		<result column="create_time_" property="createTime" />
-		<result column="update_time_" property="updateTime" />
-		<result column="operator_id_" property="operatorId" />
-		<result column="del_flag_" property="delFlag" />
-		<result column="open_flag_" property="openFlag" />
-		<result column="organ_name_" property="organName" />
-		<result column="user_id_" property="userId" />
-		<result column="music_group_id_" property="musicGroupId" />
-	</resultMap>
+    <resultMap type="com.ym.mec.biz.dal.entity.SporadicChargeInfo" id="SporadicChargeInfo">
+        <result column="id_" property="id"/>
+        <result column="title_" property="title"/>
+        <result column="charge_type_" property="chargeType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="organ_id_" property="organId"/>
+        <result column="amount_" property="amount"/>
+        <result column="discount_amount_" property="discountAmount"/>
+        <result column="detail_" property="detail"/>
+        <result column="create_time_" property="createTime"/>
+        <result column="update_time_" property="updateTime"/>
+        <result column="operator_id_" property="operatorId"/>
+        <result column="del_flag_" property="delFlag"/>
+        <result column="open_flag_" property="openFlag"/>
+        <result column="organ_name_" property="organName"/>
+        <result column="user_id_" property="userId"/>
+        <result column="music_group_id_" property="musicGroupId"/>
+        <result column="max_num_" property="maxNum"/>
+        <result column="paid_num_" property="paidNum"/>
+        <result column="version_" property="version"/>
+    </resultMap>
 
-	<!-- 根据主键查询一条记录 -->
-	<select id="get" resultMap="SporadicChargeInfo">
-		SELECT * FROM sporadic_charge_info WHERE id_ = #{id}
-	</select>
+    <!-- 根据主键查询一条记录 -->
+    <select id="get" resultMap="SporadicChargeInfo">
+        SELECT *
+        FROM sporadic_charge_info
+        WHERE id_ = #{id}
+    </select>
 
-	<!-- 全查询 -->
-	<select id="findAll" resultMap="SporadicChargeInfo">
-		SELECT * FROM sporadic_charge_info ORDER BY id_
-	</select>
+    <!-- 全查询 -->
+    <select id="findAll" resultMap="SporadicChargeInfo">
+        SELECT *
+        FROM sporadic_charge_info
+        ORDER BY id_
+    </select>
 
-	<!-- 向数据库增加一条记录 -->
-	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SporadicChargeInfo"
-		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
-		INSERT INTO sporadic_charge_info
-		(title_,charge_type_,organ_id_,amount_,discount_amount_,detail_,create_time_,update_time_,operator_id_,user_id_,music_group_id_)
-		VALUES(#{title},#{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-		#{organId},#{amount},#{discountAmount},#{detail},now(),now(),#{operatorId},#{userId},#{musicGroupId})
-	</insert>
+    <!-- 向数据库增加一条记录 -->
+    <insert id="insert" parameterType="com.ym.mec.biz.dal.entity.SporadicChargeInfo"
+            useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+        INSERT INTO sporadic_charge_info
+        (title_, charge_type_, organ_id_, amount_, discount_amount_, detail_, create_time_, update_time_, operator_id_,
+         user_id_, music_group_id_, max_num_)
+        VALUES (#{title}, #{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+                #{organId}, #{amount}, #{discountAmount}, #{detail}, now(), now(), #{operatorId}, #{userId},
+                #{musicGroupId}, #{maxNum})
+    </insert>
 
-	<!-- 根据主键查询一条记录 -->
-	<update id="update" parameterType="com.ym.mec.biz.dal.entity.SporadicChargeInfo">
-		UPDATE sporadic_charge_info
-		<set>
-			<if test="musicGroupId != null">
-				music_group_id_ = #{musicGroupId},
-			</if>
-			<if test="title != null">
-				title_ = #{title},
-			</if>
-			<if test="openFlag != null">
-				open_flag_ = #{openFlag},
-			</if>
-			<if test="chargeType != null">
-				charge_type_ = #{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
-			</if>
-			<if test="organId != null">
-				organ_id_ = #{organId},
-			</if>
-			<if test="amount != null">
-				amount_ = #{amount},
-			</if>
-			<if test="discountAmount != null">
-				discount_amount_ = #{discountAmount},
-			</if>
-			<if test="detail != null">
-				detail_ = #{detail},
-			</if>
-			<if test="updateTime != null">
-				update_time_ = now(),
-			</if>
-			<if test="operatorId != null">
-				operator_id_ = #{operatorId},
-			</if>
-			<if test="userId != null">
-				user_id_ = #{userId},
-			</if>
-		</set>
-		WHERE id_ = #{id}
-	</update>
+    <!-- 根据主键查询一条记录 -->
+    <update id="update" parameterType="com.ym.mec.biz.dal.entity.SporadicChargeInfo">
+        UPDATE sporadic_charge_info
+        <set>
+            <if test="musicGroupId != null">
+                music_group_id_ = #{musicGroupId},
+            </if>
+            <if test="title != null">
+                title_ = #{title},
+            </if>
+            <if test="openFlag != null">
+                open_flag_ = #{openFlag},
+            </if>
+            <if test="chargeType != null">
+                charge_type_ = #{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
+            </if>
+            <if test="organId != null">
+                organ_id_ = #{organId},
+            </if>
+            <if test="amount != null">
+                amount_ = #{amount},
+            </if>
+            <if test="discountAmount != null">
+                discount_amount_ = #{discountAmount},
+            </if>
+            <if test="detail != null">
+                detail_ = #{detail},
+            </if>
+            <if test="updateTime != null">
+                update_time_ = now(),
+            </if>
+            <if test="operatorId != null">
+                operator_id_ = #{operatorId},
+            </if>
+            <if test="userId != null">
+                user_id_ = #{userId},
+            </if>
+            <if test="maxNum != null">
+                max_num_ = #{maxNum},
+            </if>
+            <if test="paidNum != null">
+                paid_num_ = #{paidNum},
+            </if>
+            <if test="version != null">
+                version_ = version_+1,
+            </if>
+        </set>
+        WHERE id_ = #{id} AND version_ = #{version}
+    </update>
 
-	<!-- 根据主键删除一条记录 -->
-	<update id="delete">
-		UPDATE sporadic_charge_info SET del_flag_ = 1 WHERE id_ = #{id}
-	</update>
+    <!-- 根据主键删除一条记录 -->
+    <update id="delete">
+        UPDATE sporadic_charge_info
+        SET del_flag_ = 1
+        WHERE id_ = #{id}
+    </update>
 
-	<!-- 分页查询 -->
-	<select id="queryPage" resultMap="SporadicChargeInfo" parameterType="map">
-		SELECT sci.* FROM sporadic_charge_info sci
-		LEFT JOIN sys_user su ON su.id_ = sci.user_id_
-		<include refid="queryPageSql"/>
-		<include refid="global.orderby"/>
-		<include refid="global.limit" />
-	</select>
+    <!-- 分页查询 -->
+    <select id="queryPage" resultMap="SporadicChargeInfo" parameterType="map">
+        SELECT sci.* FROM sporadic_charge_info sci
+        LEFT JOIN sys_user su ON su.id_ = sci.user_id_
+        <include refid="queryPageSql"/>
+        <include refid="global.orderby"/>
+        <include refid="global.limit"/>
+    </select>
 
-	<sql id="queryPageSql">
-		<where>
-				sci.del_flag_ != 1
-			<if test="organId != null">
-				AND FIND_IN_SET(sci.organ_id_,#{organId})
-			</if>
-			<if test="chargeType != null">
-				AND sci.charge_type_ = #{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
-			</if>
-			<if test="type == 'personal'">
-				AND sci.user_id_ IS NOT NULL
-			</if>
-			<if test="type == 'common'">
-				AND sci.user_id_ IS NULL
-			</if>
-			<if test="openFlag != null">
-				AND sci.open_flag_ = #{openFlag}
-			</if>
-			<if test="search != null">
-				AND (sci.title_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%'))
-			</if>
-		</where>
-	</sql>
+    <sql id="queryPageSql">
+        <where>
+            sci.del_flag_ != 1
+            <if test="organId != null">
+                AND FIND_IN_SET(sci.organ_id_,#{organId})
+            </if>
+            <if test="chargeType != null">
+                AND sci.charge_type_ = #{chargeType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            </if>
+            <if test="type == 'personal'">
+                AND sci.user_id_ IS NOT NULL
+            </if>
+            <if test="type == 'common'">
+                AND sci.user_id_ IS NULL
+            </if>
+            <if test="openFlag != null">
+                AND sci.open_flag_ = #{openFlag}
+            </if>
+            <if test="search != null">
+                AND (sci.title_ LIKE CONCAT('%',#{search},'%') OR su.username_ LIKE CONCAT('%',#{search},'%'))
+            </if>
+        </where>
+    </sql>
 
-	<!-- 查询当前表的总记录数 -->
-	<select id="queryCount" resultType="int">
-		SELECT COUNT(sci.id_) FROM sporadic_charge_info sci
-		LEFT JOIN sys_user su ON su.id_ = sci.user_id_
-		<include refid="queryPageSql"/>
-	</select>
-	<select id="findInfoById" resultMap="SporadicChargeInfo">
-		SELECT * FROM sporadic_charge_info where id_ = #{id}
-	</select>
-	<!-- 根据类型和分部id查询活动 -->
-	<select id="findByOrganIdAndType" resultMap="SporadicChargeInfo">
-		SELECT * FROM sporadic_charge_info where organ_id_=#{organId} AND charge_type_=#{chargeType} AND del_flag_=0
-	</select>
+    <!-- 查询当前表的总记录数 -->
+    <select id="queryCount" resultType="int">
+        SELECT COUNT(sci.id_) FROM sporadic_charge_info sci
+        LEFT JOIN sys_user su ON su.id_ = sci.user_id_
+        <include refid="queryPageSql"/>
+    </select>
+    <select id="findInfoById" resultMap="SporadicChargeInfo">
+        SELECT *
+        FROM sporadic_charge_info
+        where id_ = #{id}
+    </select>
+    <!-- 根据类型和分部id查询活动 -->
+    <select id="findByOrganIdAndType" resultMap="SporadicChargeInfo">
+        SELECT *
+        FROM sporadic_charge_info
+        where organ_id_ = #{organId}
+          AND charge_type_ = #{chargeType}
+          AND del_flag_ = 0
+    </select>
     <select id="getOrganActiveInfo" resultMap="SporadicChargeInfo">
-		SELECT * FROM sporadic_charge_info where organ_id_=#{organId} AND charge_type_=#{chargeType} AND del_flag_=0
-	</select>
+        SELECT *
+        FROM sporadic_charge_info
+        where organ_id_ = #{organId}
+          AND charge_type_ = #{chargeType}
+          AND del_flag_ = 0
+    </select>
 
     <select id="getActiveOrgans" resultMap="com.ym.mec.biz.dal.dao.OrganizationDao.Organization">
-		SELECT o.* FROM sporadic_charge_info sci
-		LEFT JOIN organization o ON o.id_ =sci.organ_id_
-		WHERE sci.charge_type_ = #{type} AND sci.del_flag_=0
-		GROUP BY o.id_
-	</select>
+        SELECT o.*
+        FROM sporadic_charge_info sci
+                 LEFT JOIN organization o ON o.id_ = sci.organ_id_
+        WHERE sci.charge_type_ = #{type}
+          AND sci.del_flag_ = 0
+        GROUP BY o.id_
+    </select>
 </mapper>