yonge 3 years ago
parent
commit
63f28104d7

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Student.java

@@ -76,6 +76,8 @@ public class Student extends SysUser {
 	private String activityCourseDetail;
 
 	private Integer countFlag;
+	
+	private String extSubjectIds;
 
 	@ApiModelProperty(value = "家长姓名")
 	private String parentName;
@@ -316,4 +318,12 @@ public class Student extends SysUser {
 	public void setParentName(String parentName) {
 		this.parentName = parentName;
 	}
+
+	public String getExtSubjectIds() {
+		return extSubjectIds;
+	}
+
+	public void setExtSubjectIds(String extSubjectIds) {
+		this.extSubjectIds = extSubjectIds;
+	}
 }

+ 3 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/PayServiceImpl.java

@@ -126,9 +126,11 @@ public class PayServiceImpl implements PayService {
 	        		throw new BizException("平台收款账户查询失败");
 	        	}
 	        	
+	        	Integer routeOrganId = 38;
+	        	
 	        	StudentPaymentRouteOrder studentPaymentRouteOrder = new StudentPaymentRouteOrder();
 	            studentPaymentRouteOrder.setOrderNo(orderNo);
-	            studentPaymentRouteOrder.setRouteOrganId(organId);
+	            studentPaymentRouteOrder.setRouteOrganId(routeOrganId);
 	            studentPaymentRouteOrder.setFeeFlag("Y");
 	            studentPaymentRouteOrder.setRouteAmount(amount);
 	            studentPaymentRouteOrder.setRouteBalanceAmount(balanceAmount);

+ 9 - 2
mec-biz/src/main/resources/config/mybatis/StudentMapper.xml

@@ -35,6 +35,7 @@
         <result column="phone_" property="phone"/>
         <result column="username_" property="username"/>
         <result column="count_flag_" property="countFlag"/>
+        <result column="ext_subject_ids_" property="extSubjectIds"/>
         <result column="tenant_id_" property="tenantId"/>
     </resultMap>
 
@@ -88,7 +89,7 @@
         </if>
         teacher_id_,create_time_,update_time_,service_tag_update_time_,cooperation_organ_id_,
         care_package_,come_on_package_,member_rank_setting_id_,membership_start_time_,
-        membership_end_time_,current_grade_num_,current_class_,tenant_id_)
+        membership_end_time_,current_grade_num_,current_class_,ext_subject_ids_,tenant_id_)
         VALUES
         (#{userId},#{schoolName},#{subjectIdList},
         <if test="serviceTag != null">
@@ -99,7 +100,7 @@
         </if>
         #{teacherId},NOW(),NOW(),NOW(),#{cooperationOrganId},
          #{carePackage},#{comeOnPackage},#{memberRankSettingId},#{membershipStartTime},
-         #{membershipEndTime},#{currentGradeNum},#{currentClass},#{tenantId})
+         #{membershipEndTime},#{currentGradeNum},#{currentClass},#{extSubjectIds},#{tenantId})
     </insert>
 
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.Student">
@@ -160,6 +161,9 @@
             <if test="activityCourseDetail != null">
                 activity_course_detail_=#{activityCourseDetail},
             </if>
+            <if test="extSubjectIds != null">
+                ext_subject_ids_=#{extSubjectIds},
+            </if>
                 cooperation_organ_id_=#{cooperationOrganId},
                 update_time_ = NOW()
         </set>
@@ -286,6 +290,9 @@
 	            <if test="item.membershipEndTime != null">
 	                membership_end_time_=#{item.membershipEndTime},
 	            </if>
+	            <if test="item.extSubjectIds != null">
+	                ext_subject_ids_=#{item.extSubjectIds},
+	            </if>
                 update_time_ = NOW()
             </set>
             WHERE user_id_ = #{item.userId} and tenant_id_ = #{item.tenantId}