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

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

@@ -33,6 +33,14 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
                                               @Param("status") String status);
 
     /**
+     * @Author: Joburgess
+     * @Date: 2019/10/3
+     * 根据学生vip课获取非失败缴费订单
+     */
+    StudentPaymentOrder findNotFailedOrderByStudentVipGroup(@Param("vipGroupId") Long vipGroupId,
+                                              @Param("userId") Integer userId);
+
+    /**
      * @describe 统计报名人数
      * @author Joburgess
      * @date 2019/11/13

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

@@ -9,8 +9,6 @@ import java.util.List;
 
 public interface SysAccountDao extends BaseDAO<Integer, SysAccount> {
 
-    int updateByPrimaryKey(SysAccount record);
-
     /**
      * 获取一个私户
      *
@@ -18,6 +16,4 @@ public interface SysAccountDao extends BaseDAO<Integer, SysAccount> {
      * @return
      */
     SysAccount getPerAccount(@Param("amount") BigDecimal amount);
-
-    int batchInsert(@Param("sysAccountList") List<SysAccount> sysAccountList);
 }

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

@@ -1,6 +1,14 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ym.mec.auth.api.entity.SysUser;
+import com.ym.mec.biz.dal.enums.CourseStatusEnum;
+import com.ym.mec.biz.dal.enums.GroupType;
+import com.ym.mec.biz.dal.enums.TeachModeEnum;
+import com.ym.mec.common.enums.BaseEnum;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
@@ -8,16 +16,6 @@ import java.text.SimpleDateFormat;
 import java.util.List;
 import java.util.Objects;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.enums.CourseStatusEnum;
-import com.ym.mec.biz.dal.enums.GroupType;
-import com.ym.mec.biz.dal.enums.TeachModeEnum;
-import com.ym.mec.common.enums.BaseEnum;
-
 /**
  * 对应数据库表(course_schedule):
  */
@@ -122,11 +120,21 @@ public class CourseSchedule {
 
 	private Integer schoolId;
 
+	private String schoolName;
+
 	/** 主教是否不需要重新生成课酬 */
 	private boolean bishopTeacherSalaryNotCreate;
 
 	private String classGroupName;
 
+	public String getSchoolName() {
+		return schoolName;
+	}
+
+	public void setSchoolName(String schoolName) {
+		this.schoolName = schoolName;
+	}
+
 	public String getClassGroupName() {
 		return classGroupName;
 	}

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

@@ -12,6 +12,9 @@ public class SysAccount {
      */
     @Version
     private Integer version;
+
+    //账户所属公司
+    private String company;
     /**
     * 收款商户号
     */
@@ -35,7 +38,7 @@ public class SysAccount {
     /**
     * 支付渠道类型(PER-个人 COM-公户)
     */
-    private String channelType;
+    private String type;
 
 
     public Integer getId() {
@@ -78,12 +81,12 @@ public class SysAccount {
         this.channel = channel;
     }
 
-    public String getChannelType() {
-        return channelType;
+    public String getType() {
+        return type;
     }
 
-    public void setChannelType(String channelType) {
-        this.channelType = channelType;
+    public void setType(String type) {
+        this.type = type;
     }
 
     public Integer getVersion() {
@@ -93,4 +96,12 @@ public class SysAccount {
     public void setVersion(Integer version) {
         this.version = version;
     }
+
+    public String getCompany() {
+        return company;
+    }
+
+    public void setCompany(String company) {
+        this.company = company;
+    }
 }

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

@@ -494,8 +494,6 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
                             errInfo.append("安排的课程存在学生冲突");
                             throw new BizException(errInfo.toString());
                         }
-						System.out.print(j==repeatTimes);
-                        System.out.println(" "+j);
                         if(j==repeatTimes){
                             repeatTimes+=1;
                         }

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

@@ -907,9 +907,8 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			throw new BizException("该课程已结束报名!");
 		}
 
-		StudentPaymentOrder oldOrder = studentPaymentOrderDao.findByStudentVipGroup(vipGroupBuyParams.getVipGroupId(),
-				user.getId(),
-				null);
+		StudentPaymentOrder oldOrder = studentPaymentOrderDao.findNotFailedOrderByStudentVipGroup(vipGroupBuyParams.getVipGroupId(),
+				user.getId());
 
 		if(Objects.nonNull(oldOrder)&&oldOrder.getStatus().equals(DealStatusEnum.SUCCESS)){
 			throw new BizException("您已购买过此课程");

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

@@ -28,6 +28,7 @@
         <result column="student_num_" property="studentNum"/>
         <result column="leave_student_num_" property="leaveStudentNum"/>
         <result column="schoole_id_" property="schoolId"/>
+        <result column="schoole_name_" property="schoolName"/>
         <result column="class_group_name_" property="classGroupName"/>
     </resultMap>
     
@@ -805,9 +806,11 @@
             cs.name_,
             cs.student_num_,
             cs.leave_student_num_,
-            cs.schoole_id_
+            cs.schoole_id_,
+            s.name_ schoole_name_
         FROM
         	course_schedule cs
+        	LEFT JOIN school s ON cs.schoole_id_=s.id_
         WHERE
           cs.music_group_id_ =#{vipGroupId} AND cs.group_type_ = 'VIP'
     </select>

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

@@ -205,6 +205,16 @@
             </if>
             AND spo.type_ = 'SMALL_CLASS_TO_BUY'
     </select>
+    <select id="findNotFailedOrderByStudentVipGroup" resultMap="StudentPaymentOrder">
+        SELECT
+          spo.*
+        FROM
+          student_payment_order spo
+        WHERE spo.user_id_=#{userId}
+            AND spo.music_group_id_=#{vipGroupId}
+            AND spo.status_!='FAILED'
+            AND spo.type_ = 'SMALL_CLASS_TO_BUY'
+    </select>
     <!-- 查询报名订单 -->
     <select id="findMusicGroupApplyOrderByStatus" resultMap="StudentPaymentOrder">
         SELECT * FROM student_payment_order WHERE music_group_id_= #{musicGroupId} AND user_id_=#{userId} AND type_ =

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

@@ -4,15 +4,16 @@
   <resultMap id="SysAccount" type="com.ym.mec.biz.dal.entity.SysAccount">
     <!--@Table sys_account-->
     <id column="id_" jdbcType="INTEGER" property="id" />
+    <result column="company_" jdbcType="VARCHAR" property="company" />
     <result column="mer_no_" jdbcType="VARCHAR" property="merNo" />
     <result column="max_receipt_" jdbcType="DECIMAL" property="maxReceipt" />
     <result column="has_receipt_" jdbcType="DECIMAL" property="hasReceipt" />
     <result column="channel_" jdbcType="VARCHAR" property="channel" />
-    <result column="channel_type_" jdbcType="CHAR" property="channelType" />
+    <result column="type_" jdbcType="CHAR" property="type" />
     <result column="version" jdbcType="INTEGER" property="version" />
   </resultMap>
   <sql id="Base_Column_List">
-    id_, mer_no_, max_receipt_, has_receipt_, channel_, channel_type_, version
+    id_,company_, mer_no_, max_receipt_, has_receipt_, channel_, type_, version
   </sql>
   <select id="get" parameterType="java.lang.Integer" resultMap="SysAccount">
     <!--@mbg.generated-->
@@ -30,6 +31,9 @@
     <!--@mbg.generated-->
     insert into sys_account
     <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="company != null">
+        company_,
+      </if>
       <if test="merNo != null">
         mer_no_,
       </if>
@@ -42,14 +46,17 @@
       <if test="channel != null">
         channel_,
       </if>
-      <if test="channelType != null">
-        channel_type_,
+      <if test="type != null">
+        type_,
       </if>
       <if test="version != null">
         version,
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="company != null">
+        #{company,jdbcType=VARCHAR},
+      </if>
       <if test="merNo != null">
         #{merNo,jdbcType=VARCHAR},
       </if>
@@ -62,8 +69,8 @@
       <if test="channel != null">
         #{channel,jdbcType=VARCHAR},
       </if>
-      <if test="channelType != null">
-        #{channelType,jdbcType=CHAR},
+      <if test="type != null">
+          #{type,jdbcType=CHAR},
       </if>
       <if test="version != null">
         #{version,jdbcType=INTEGER},
@@ -74,6 +81,9 @@
     <!--@mbg.generated-->
     update sys_account
     <set>
+      <if test="company != null">
+        company_ = #{company,jdbcType=VARCHAR},
+      </if>
       <if test="merNo != null">
         mer_no_ = #{merNo,jdbcType=VARCHAR},
       </if>
@@ -86,8 +96,8 @@
       <if test="channel != null">
         channel_ = #{channel,jdbcType=VARCHAR},
       </if>
-      <if test="channelType != null">
-        channel_type_ = #{channelType,jdbcType=CHAR},
+      <if test="type != null">
+          type_ = #{type,jdbcType=CHAR},
       </if>
       <if test="version != null">
         version = version+1,
@@ -95,28 +105,8 @@
     </set>
     where id_ = #{id,jdbcType=INTEGER} AND version =#{version}
   </update>
-  <update id="updateByPrimaryKey" parameterType="com.ym.mec.biz.dal.entity.SysAccount">
-    <!--@mbg.generated-->
-    update sys_account
-    set mer_no_ = #{merNo,jdbcType=VARCHAR},
-      max_receipt_ = #{maxReceipt,jdbcType=DECIMAL},
-      has_receipt_ = #{hasReceipt,jdbcType=DECIMAL},
-      channel_ = #{channel,jdbcType=VARCHAR},
-      channel_type_ = #{channelType,jdbcType=CHAR},
-      version = #{version,jdbcType=INTEGER}
-    where id_ = #{id,jdbcType=INTEGER}
-  </update>
-  <select id="find"></select>
   <!-- 获取一个私户账户 -->
   <select id="getPerAccount" resultMap="SysAccount">
-    SELECT * FROM sys_account WHERE channel_ = 'YQPAY' AND channel_type_ = 'PER'
+    SELECT * FROM sys_account WHERE channel_ = 'YQPAY' AND type_ = 'PER'
   </select>
-
-  <insert id="batchInsert" parameterType="java.util.List" useGeneratedKeys="true" keyProperty="id_">
-    INSERT INTO sys_account (id_,mer_no_,channel_)
-    VALUES
-    <foreach collection="sysAccountList" item="data" separator=",">
-      (#{data.id},#{data.merNo},#{data.channel})
-    </foreach>
-  </insert>
 </mapper>