update

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

@@ -20,7 +20,7 @@ public class ExtensionOrder {
 	private String orderType;
 	
 	/**  */
-	private java.util.Date payTime;
+	private String payTime;
 	
 	/**  */
 	private Integer extensionUserId;
@@ -68,11 +68,11 @@ public class ExtensionOrder {
 		return this.orderType;
 	}
 			
-	public void setPayTime(java.util.Date payTime){
+	public void setPayTime(String payTime){
 		this.payTime = payTime;
 	}
 	
-	public java.util.Date getPayTime(){
+	public String getPayTime(){
 		return this.payTime;
 	}
 			

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

@@ -128,6 +128,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
             user.setUserType("STUDENT");
             user.setCreateTime(date);
             user.setUpdateTime(date);
+            if(user.getTenantId() == 28){
+            	user.setTenantId(1);
+            }
             // 注册账户信息
             teacherDao.addSysUser(user);
             userId = user.getId();
@@ -144,6 +147,9 @@ public class StudentServiceImpl extends BaseServiceImpl<Integer, Student> implem
         student.setCurrentGradeNum(studentPreRegistration.getCurrentGradeNum());
         student.setSubjectIdList(studentPreRegistration.getSelectionSubjectId().toString());
         student.setCurrentClass(studentPreRegistration.getCurrentClass());
+        if(student.getTenantId() == 28){
+        	student.setTenantId(1);
+        }
         studentDao.insert(student);
         TenantContextHolder.clearTenantId();
         

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

@@ -636,7 +636,11 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 				"activityBuy"
 		);
 
-		studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));
+		if(studentPaymentOrder.getOrganId() == 122){
+			studentPaymentOrder.setMerNos("H004236");
+		}else{
+			studentPaymentOrder.setMerNos((String) payMap.get("routingMerNos"));
+		}
 		studentPaymentOrder.setPaymentChannel((String) payMap.get("type"));
 		studentPaymentOrderService.update(studentPaymentOrder);
 		return BaseController.succeed(payMap);

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

@@ -79,7 +79,7 @@
 
 	<!-- 分页查询 -->
 	<select id="queryPage" resultMap="ExtensionOrder" parameterType="map">
-		SELECT eo.order_no_,spo.expect_amount_ order_amount_, eo.order_type_,spo.pay_time_, ifnull(u.real_name_,u.username_) extension_user_,
+		SELECT eo.order_no_,spo.expect_amount_ order_amount_, eo.order_type_,ifnull(spo.pay_time_,eo.pay_time_), ifnull(u.real_name_,u.username_) extension_user_,
 		eo.extension_fee_
 		FROM extension_order eo join student_payment_order spo on eo.order_no_ = spo.order_no_
 		left join sys_user u on eo.extension_user_id_ = u.id_