Merge remote-tracking branch 'origin/saas' into saas

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

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.biz.dal.entity.CourseScheduleSw;
+
+public interface CourseScheduleSwDao extends BaseDAO<Long, CourseScheduleSw> {
+
+	
+}

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

@@ -0,0 +1,9 @@
+package com.ym.mec.biz.dal.dao;
+
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.biz.dal.entity.ExtensionOrder;
+
+public interface ExtensionOrderDao extends BaseDAO<Long, ExtensionOrder> {
+
+	
+}

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

@@ -10,6 +10,7 @@ import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
 import com.ym.mec.biz.dal.vo.StudentPaymentOrderVo;
 import com.ym.mec.common.dal.BaseDAO;
+
 import org.apache.ibatis.annotations.Param;
 
 import java.math.BigDecimal;
@@ -79,6 +80,8 @@ public interface StudentPaymentOrderDao extends BaseDAO<Long, StudentPaymentOrde
      * @return
      */
     StudentPaymentOrder findOrderByOrderNo(@Param("orderNo") String orderNo);
+    
+    List<StudentPaymentOrder> findOrderByOrderNos(@Param("orderNoList") List<String> orderNoList);
 
     /**
      * 根据批次号查询

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

@@ -0,0 +1,145 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(course_schedule_sw):
+ */
+public class CourseScheduleSw {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	private Integer teacherId;
+	
+	private String teacherName;
+	
+	/**  */
+	private String courseType;
+	
+	/**  */
+	private String courseName;
+	
+	/**  */
+	private String teachMode;
+	
+	private String courseStatus;
+	
+	/**  */
+	private java.util.Date classDate;
+	
+	/**  */
+	private String classTime;
+	
+	/**  */
+	private java.math.BigDecimal salary;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setTeacherId(Integer teacherId){
+		this.teacherId = teacherId;
+	}
+	
+	public Integer getTeacherId(){
+		return this.teacherId;
+	}
+			
+	public String getTeacherName() {
+		return teacherName;
+	}
+
+	public void setTeacherName(String teacherName) {
+		this.teacherName = teacherName;
+	}
+
+	public void setCourseType(String courseType){
+		this.courseType = courseType;
+	}
+	
+	public String getCourseType(){
+		return this.courseType;
+	}
+			
+	public void setCourseName(String courseName){
+		this.courseName = courseName;
+	}
+	
+	public String getCourseName(){
+		return this.courseName;
+	}
+			
+	public void setTeachMode(String teachMode){
+		this.teachMode = teachMode;
+	}
+	
+	public String getTeachMode(){
+		return this.teachMode;
+	}
+			
+	public String getCourseStatus() {
+		return courseStatus;
+	}
+
+	public void setCourseStatus(String courseStatus) {
+		this.courseStatus = courseStatus;
+	}
+
+	public void setClassDate(java.util.Date classDate){
+		this.classDate = classDate;
+	}
+	
+	public java.util.Date getClassDate(){
+		return this.classDate;
+	}
+			
+	public void setClassTime(String classTime){
+		this.classTime = classTime;
+	}
+	
+	public String getClassTime(){
+		return this.classTime;
+	}
+			
+	public void setSalary(java.math.BigDecimal salary){
+		this.salary = salary;
+	}
+	
+	public java.math.BigDecimal getSalary(){
+		return this.salary;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

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

@@ -0,0 +1,124 @@
+package com.ym.mec.biz.dal.entity;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * 对应数据库表(extension_order):
+ */
+public class ExtensionOrder {
+
+	/**  */
+	private Long id;
+	
+	/**  */
+	private String orderNo;
+	
+	/**  */
+	private java.math.BigDecimal orderAmount;
+	
+	/**  */
+	private String orderType;
+	
+	/**  */
+	private String payTime;
+	
+	/**  */
+	private Integer extensionUserId;
+	
+	private String extensionUser;
+	
+	/**  */
+	private java.math.BigDecimal extensionFee;
+	
+	/**  */
+	private java.util.Date updateTime;
+	
+	/**  */
+	private java.util.Date createTime;
+	
+	public void setId(Long id){
+		this.id = id;
+	}
+	
+	public Long getId(){
+		return this.id;
+	}
+			
+	public void setOrderNo(String orderNo){
+		this.orderNo = orderNo;
+	}
+	
+	public String getOrderNo(){
+		return this.orderNo;
+	}
+			
+	public void setOrderAmount(java.math.BigDecimal orderAmount){
+		this.orderAmount = orderAmount;
+	}
+	
+	public java.math.BigDecimal getOrderAmount(){
+		return this.orderAmount;
+	}
+			
+	public void setOrderType(String orderType){
+		this.orderType = orderType;
+	}
+	
+	public String getOrderType(){
+		return this.orderType;
+	}
+			
+	public void setPayTime(String payTime){
+		this.payTime = payTime;
+	}
+	
+	public String getPayTime(){
+		return this.payTime;
+	}
+			
+	public void setExtensionUserId(Integer extensionUserId){
+		this.extensionUserId = extensionUserId;
+	}
+	
+	public Integer getExtensionUserId(){
+		return this.extensionUserId;
+	}
+			
+	public String getExtensionUser() {
+		return extensionUser;
+	}
+
+	public void setExtensionUser(String extensionUser) {
+		this.extensionUser = extensionUser;
+	}
+
+	public void setExtensionFee(java.math.BigDecimal extensionFee){
+		this.extensionFee = extensionFee;
+	}
+	
+	public java.math.BigDecimal getExtensionFee(){
+		return this.extensionFee;
+	}
+			
+	public void setUpdateTime(java.util.Date updateTime){
+		this.updateTime = updateTime;
+	}
+	
+	public java.util.Date getUpdateTime(){
+		return this.updateTime;
+	}
+			
+	public void setCreateTime(java.util.Date createTime){
+		this.createTime = createTime;
+	}
+	
+	public java.util.Date getCreateTime(){
+		return this.createTime;
+	}
+			
+	@Override
+	public String toString() {
+		return ToStringBuilder.reflectionToString(this);
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/CourseScheduleSWQueryInfo.java

@@ -0,0 +1,70 @@
+package com.ym.mec.biz.dal.page;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
+
+import com.ym.mec.common.page.QueryInfo;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/12/27
+ */
+public class CourseScheduleSWQueryInfo extends QueryInfo {
+
+    @ApiModelProperty(value = "教师编号")
+    private String teacherIdList;
+
+    @ApiModelProperty(value = "课程创建开始时间")
+    private Date createStartDate;
+    
+    @ApiModelProperty(value = "课程创建结束时间")
+    private Date createEndDate;
+
+    @ApiModelProperty(value = "课程状态")
+    private String courseStatus;
+
+    @ApiModelProperty(value = "上课模式")
+    private String teachMode;
+
+	public String getTeacherIdList() {
+		return teacherIdList;
+	}
+
+	public void setTeacherIdList(String teacherIdList) {
+		this.teacherIdList = teacherIdList;
+	}
+
+	public Date getCreateStartDate() {
+		return createStartDate;
+	}
+
+	public void setCreateStartDate(Date createStartDate) {
+		this.createStartDate = createStartDate;
+	}
+
+	public Date getCreateEndDate() {
+		return createEndDate;
+	}
+
+	public void setCreateEndDate(Date createEndDate) {
+		this.createEndDate = createEndDate;
+	}
+
+	public String getCourseStatus() {
+		return courseStatus;
+	}
+
+	public void setCourseStatus(String courseStatus) {
+		this.courseStatus = courseStatus;
+	}
+
+	public String getTeachMode() {
+		return teachMode;
+	}
+
+	public void setTeachMode(String teachMode) {
+		this.teachMode = teachMode;
+	}
+
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ExtensionSWQueryInfo.java

@@ -0,0 +1,35 @@
+package com.ym.mec.biz.dal.page;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import com.ym.mec.common.page.QueryInfo;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/12/27
+ */
+public class ExtensionSWQueryInfo extends QueryInfo {
+
+    @ApiModelProperty(value = "推广用户编号")
+    private Integer extensionUserId;
+
+    @ApiModelProperty(value = "订单编号")
+    private String orderNo;
+
+	public Integer getExtensionUserId() {
+		return extensionUserId;
+	}
+
+	public void setExtensionUserId(Integer extensionUserId) {
+		this.extensionUserId = extensionUserId;
+	}
+
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+}

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

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.CourseScheduleSw;
+import com.ym.mec.common.service.BaseService;
+
+public interface CourseScheduleSwService extends BaseService<Long, CourseScheduleSw> {
+
+}

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

@@ -0,0 +1,8 @@
+package com.ym.mec.biz.service;
+
+import com.ym.mec.biz.dal.entity.ExtensionOrder;
+import com.ym.mec.common.service.BaseService;
+
+public interface ExtensionOrderService extends BaseService<Long, ExtensionOrder> {
+
+}

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

@@ -1,7 +1,17 @@
 package com.ym.mec.biz.service;
 
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.ibatis.annotations.Param;
+
 import com.ym.mec.biz.dal.dao.StudentPaymentOrderDao;
-import com.ym.mec.biz.dal.dto.*;
+import com.ym.mec.biz.dal.dto.PageInfoOrder;
+import com.ym.mec.biz.dal.dto.SporadicChargeInfoDto;
+import com.ym.mec.biz.dal.dto.StudentPaymentOrderDto;
+import com.ym.mec.biz.dal.dto.StudentPaymentOrderExportDto;
 import com.ym.mec.biz.dal.entity.ActivityUserMapper;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
@@ -19,12 +29,6 @@ import com.ym.mec.common.page.PageInfo;
 import com.ym.mec.common.service.BaseService;
 import com.ym.mec.thirdparty.adapay.entity.BaseResult;
 import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
-import org.apache.ibatis.annotations.Param;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
 
 public interface StudentPaymentOrderService extends BaseService<Long, StudentPaymentOrder> {
 
@@ -60,6 +64,8 @@ public interface StudentPaymentOrderService extends BaseService<Long, StudentPay
      * @return
      */
     StudentPaymentOrder findOrderByOrderNo(String orderNo);
+    
+    List<StudentPaymentOrder> findOrderByOrderNos(List<String> orderNoList);
 
     /**
      * 根据批次号查询

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

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.CourseScheduleSwDao;
+import com.ym.mec.biz.dal.entity.CourseScheduleSw;
+import com.ym.mec.biz.service.CourseScheduleSwService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class CourseScheduleSwServiceImpl extends BaseServiceImpl<Long, CourseScheduleSw>  implements CourseScheduleSwService {
+	
+	@Autowired
+	private CourseScheduleSwDao courseScheduleSwDao;
+
+	@Override
+	public BaseDAO<Long, CourseScheduleSw> getDAO() {
+		return courseScheduleSwDao;
+	}
+	
+}

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

@@ -0,0 +1,23 @@
+package com.ym.mec.biz.service.impl;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.ym.mec.biz.dal.dao.ExtensionOrderDao;
+import com.ym.mec.biz.dal.entity.ExtensionOrder;
+import com.ym.mec.biz.service.ExtensionOrderService;
+import com.ym.mec.common.dal.BaseDAO;
+import com.ym.mec.common.service.impl.BaseServiceImpl;
+
+@Service
+public class ExtensionOrderServiceImpl extends BaseServiceImpl<Long, ExtensionOrder>  implements ExtensionOrderService {
+	
+	@Autowired
+	private ExtensionOrderDao extensionOrderDao;
+
+	@Override
+	public BaseDAO<Long, ExtensionOrder> getDAO() {
+		return extensionOrderDao;
+	}
+	
+}

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

@@ -325,15 +325,14 @@ public class OrderPayOpsServiceImpl implements OrderPayOpsService {
 
                     //String platformAccount = sysConfigDao.findConfigValue(SysConfigService.PLATFORM_PAYEE_ACCOUNT);
 
-                    if (StringUtils.isBlank(platformAccount)) {
-                        throw new BizException("平台收款账户查询失败");
-                    }
+                    if (StringUtils.isNotBlank(platformAccount)) {
 
-                    Map<String, Object> divMember = new HashMap<>();
-                    divMember.put("member_id", platformAccount);
-                    divMember.put("amount", amount);
-                    divMember.put("fee_flag", "Y");
-                    divMemberList.add(divMember);
+                        Map<String, Object> divMember = new HashMap<>();
+                        divMember.put("member_id", platformAccount);
+                        divMember.put("amount", amount);
+                        divMember.put("fee_flag", "Y");
+                        divMemberList.add(divMember);
+                    }
                 }
 
                 Map<String, Object> divMember1 = new HashMap<>();

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

@@ -32,7 +32,6 @@ import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
 import com.ym.mec.biz.dal.entity.StudentPaymentOrderDetail;
 import com.ym.mec.biz.dal.entity.StudentPaymentRouteOrder;
 import com.ym.mec.biz.dal.entity.SysPaymentConfig;
-import com.ym.mec.biz.dal.entity.MusicGroupPaymentCalender.PaymentCalenderStatusEnum;
 import com.ym.mec.biz.dal.enums.FeeTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderDetailTypeEnum;
 import com.ym.mec.biz.dal.enums.OrderTypeEnum;
@@ -43,7 +42,6 @@ import com.ym.mec.biz.service.PayService;
 import com.ym.mec.biz.service.SellOrderService;
 import com.ym.mec.biz.service.StudentPaymentOrderDetailService;
 import com.ym.mec.biz.service.StudentPaymentOrderService;
-import com.ym.mec.biz.service.SysConfigService;
 import com.ym.mec.biz.service.SysPaymentConfigService;
 import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.redis.service.RedisCache;

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

@@ -115,13 +115,27 @@ public class StudentManageServiceImpl implements StudentManageService {
         Map<String, Object> params = new HashMap<String, Object>();
         MapUtil.populateMap(params, queryInfo);
 
+        List<StudentManageListDto> dataList = null;
+        
+        int jmCount = 0;
+        if(queryInfo.getTenantId() == 28){
+        	queryInfo.setOrganId(null);
+        	jmCount = studentManageDao.countStudentByOrganId(params);
+            params.put("offset", pageInfo.getOffset());
+        	dataList = studentManageDao.findStudentsByOrganId(params);
+        	
+        	queryInfo.setTenantId(1);
+        	params.clear();
+            MapUtil.populateMap(params, queryInfo);
+        }
+
         if(StringUtils.isNotEmpty(queryInfo.getOrganId())){
             String[] organIds = queryInfo.getOrganId().split(",");
             params.put("organIds", organIds);
         }
 
-        List<StudentManageListDto> dataList = null;
         int count = studentManageDao.countStudentByOrganId(params);
+        count = count + jmCount;
         if (queryInfo.getIsExport()) {
             if (count > 50000) {
                 throw new BizException("数据集太大，不能导出.最大数据集不能超过50000");
@@ -130,7 +144,11 @@ public class StudentManageServiceImpl implements StudentManageService {
         if (count > 0) {
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
-            dataList = studentManageDao.findStudentsByOrganId(params);
+            if(dataList == null){
+            	dataList = studentManageDao.findStudentsByOrganId(params);
+            }else{
+            	dataList.addAll(studentManageDao.findStudentsByOrganId(params));
+            }
             Set<Integer> userIds = dataList.stream().map(e -> e.getUserId()).collect(Collectors.toSet());
             List<Integer> organIds = dataList.stream().map(e -> e.getOrganId()).distinct().collect(Collectors.toList());
             List<Integer> courseTeacherIds = dataList.stream().map(e -> e.getCourseTeacher()).distinct().collect(Collectors.toList());

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

@@ -31,6 +31,7 @@ import com.ym.mec.thirdparty.adapay.entity.HfMerchantConfig;
 import com.ym.mec.thirdparty.yqpay.*;
 import com.ym.mec.util.collection.MapUtil;
 import com.ym.mec.util.date.DateUtil;
+
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
@@ -220,6 +221,11 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
     }
 
     @Override
+	public List<StudentPaymentOrder> findOrderByOrderNos(List<String> orderNoList) {
+        return studentPaymentOrderDao.findOrderByOrderNos(orderNoList);
+	}
+
+	@Override
     public List<StudentPaymentOrder> queryByBatchNo(Integer userId, String batchNo, DealStatusEnum status) {
         return studentPaymentOrderDao.queryByBatchNo(userId, batchNo, status);
     }
@@ -630,14 +636,36 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
         MapUtil.populateMap(params, queryInfo);
 
         List<StudentPaymentOrderDto> dataList = new ArrayList<>();
+        
+        int jmCount = 0;
+        if(queryInfo.getTenantId() == 28){
+        	queryInfo.setOrganId(null);
+        	jmCount = findCount(params);
+            params.put("offset", pageInfo.getOffset());
+        	dataList = studentPaymentOrderDao.queryPageOrder(params);
+        	
+        	queryInfo.setTenantId(1);
+        	if(StringUtils.isBlank(queryInfo.getMerNos())){
+        		queryInfo.setMerNos("H004236");
+        	}
+        	params.clear();
+        	MapUtil.populateMap(params, queryInfo);
+        }
+        
         int count = this.findCount(params);
+        count = count + jmCount;
 
         BigDecimal totalUserBalance = sysUserCashAccountDao.getTotalUserBalance(params);
         pageInfo.setTotalUserBalance(totalUserBalance);
         if (count > 0) {
             pageInfo.setTotal(count);
             params.put("offset", pageInfo.getOffset());
-            dataList = studentPaymentOrderDao.queryPageOrder(params);
+            
+            if(dataList == null){
+            	dataList = studentPaymentOrderDao.queryPageOrder(params);
+            }else{
+            	dataList.addAll(studentPaymentOrderDao.queryPageOrder(params));
+            }
 
             StudentPaymentOrder orderMoneyAmount = studentPaymentOrderDao.getOrderMoneyAmount(params);
             BigDecimal totalExpectAmount = orderMoneyAmount.getExpectAmount() != null ? orderMoneyAmount.getExpectAmount() : BigDecimal.ZERO;

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

@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
+<mapper namespace="com.ym.mec.biz.dal.dao.CourseScheduleSwDao">
+
+	<resultMap type="com.ym.mec.biz.dal.entity.CourseScheduleSw"
+		id="CourseScheduleSw">
+		<result column="id_" property="id" />
+		<result column="teacher_id_" property="teacherId" />
+		<result column="teacher_name_" property="teacherName" />
+		<result column="course_type_" property="courseType" />
+		<result column="course_name_" property="courseName" />
+		<result column="teach_mode_" property="teachMode" />
+		<result column="course_status_" property="courseStatus" />
+		<result column="class_date_" property="classDate" />
+		<result column="class_time_" property="classTime" />
+		<result column="salary_" property="salary" />
+		<result column="create_time_" property="createTime" />
+		<result column="update_time_" property="updateTime" />
+	</resultMap>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="CourseScheduleSw">
+		SELECT * FROM course_schedule_sw WHERE id_ = #{id}
+	</select>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="CourseScheduleSw">
+		SELECT * FROM course_schedule_sw ORDER BY id_
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.CourseScheduleSw"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
+			AS ID FROM DUAL </selectKey> -->
+		INSERT INTO course_schedule_sw
+		(id_,teacher_id_,course_type_,course_name_,teach_mode_,class_date_,class_time_,salary_,create_time_,update_time_,course_status_)
+		VALUES(#{id},#{teacherId},#{courseType},#{courseName},#{teachMode},#{classDate},#{classTime},#{salary},#{createTime},#{updateTime},#{courseStatus})
+	</insert>
+
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.CourseScheduleSw">
+		UPDATE course_schedule_sw
+		<set>
+			<if test="classDate != null">
+				class_date_ = #{classDate},
+			</if>
+			<if test="classTime != null">
+				class_time_ = #{classTime},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="teacherId != null">
+				teacher_id_ = #{teacherId},
+			</if>
+			<if test="teachMode != null">
+				teach_mode_ = #{teachMode},
+			</if>
+			<if test="courseStatus != null">
+				course_status_ = #{courseStatus},
+			</if>
+			<if test="salary != null">
+				salary_ = #{salary},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="courseType != null">
+				course_type_ = #{courseType},
+			</if>
+			<if test="courseName != null">
+				course_name_ = #{courseName},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+		</set>
+		WHERE id_ = #{id}
+	</update>
+
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM course_schedule_sw WHERE id_ =
+		#{id}
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="CourseScheduleSw"
+		parameterType="map">
+		SELECT cs.*,ifnull(u.real_name_,u.username_) teacher_name_ FROM course_schedule_sw cs left join sys_user u on cs.teacher_id_ = u.id_ 
+		<where>
+			<if test="teacherIdList != null">
+				and cs.teacher_id_ = #{teacherIdList}
+			</if>
+			<if test="courseStatus != null">
+				and cs.course_status_ = #{courseStatus}
+			</if>
+			<if test="teachMode != null">
+				and cs.teach_mode_ = #{teachMode}
+			</if>
+			<if test="createStartDate != null">
+				and class_date_ &gt;= #{createStartDate}
+			</if>
+			<if test="createEndDate != null">
+				and class_date_ &lt;= #{createEndDate}
+			</if>
+		</where>
+		ORDER BY cs.class_date_ desc
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM course_schedule_sw cs left join sys_user u on cs.teacher_id_ = u.id_
+		<where>
+			<if test="teacherIdList != null">
+				and cs.teacher_id_ = #{teacherIdList}
+			</if>
+			<if test="courseStatus != null">
+				and cs.course_status_ = #{courseStatus}
+			</if>
+			<if test="teachMode != null">
+				and cs.teach_mode_ = #{teachMode}
+			</if>
+			<if test="createStartDate != null">
+				and class_date_ &gt;= #{createStartDate}
+			</if>
+			<if test="createEndDate != null">
+				and class_date_ &lt;= #{createEndDate}
+			</if>
+		</where>
+	</select>
+</mapper>

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

@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<!-- 这个文件是自动生成的。 不要修改此文件。所有改动将在下次重新自动生成时丢失。 -->
+<mapper namespace="com.ym.mec.biz.dal.dao.ExtensionOrderDao">
+
+	<resultMap type="com.ym.mec.biz.dal.entity.ExtensionOrder"
+		id="ExtensionOrder">
+		<result column="id_" property="id" />
+		<result column="order_no_" property="orderNo" />
+		<result column="order_amount_" property="orderAmount" />
+		<result column="order_type_" property="orderType" />
+		<result column="pay_time_" property="payTime" />
+		<result column="extension_user_id_" property="extensionUserId" />
+		<result column="extension_user_" property="extensionUser" />
+		<result column="extension_fee_" property="extensionFee" />
+		<result column="update_time_" property="updateTime" />
+		<result column="create_time_" property="createTime" />
+	</resultMap>
+
+	<!-- 根据主键查询一条记录 -->
+	<select id="get" resultMap="ExtensionOrder">
+		SELECT * FROM extension_order WHERE id_ = #{id}
+	</select>
+
+	<!-- 全查询 -->
+	<select id="findAll" resultMap="ExtensionOrder">
+		SELECT * FROM extension_order ORDER BY id_
+	</select>
+
+	<!-- 向数据库增加一条记录 -->
+	<insert id="insert" parameterType="com.ym.mec.biz.dal.entity.ExtensionOrder"
+		useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+		<!-- <selectKey resultClass="int" keyProperty="id" > SELECT SEQ_WSDEFINITION_ID.nextval 
+			AS ID FROM DUAL </selectKey> -->
+		INSERT INTO extension_order
+		(id_,order_no_,order_amount_,order_type_,pay_time_,extension_user_id_,extension_fee_,update_time_,create_time_)
+		VALUES(#{id},#{orderNo},#{orderAmount},#{orderType},#{payTime},#{extensionUserId},#{extensionFee},#{updateTime},#{createTime})
+	</insert>
+
+	<!-- 根据主键查询一条记录 -->
+	<update id="update" parameterType="com.ym.mec.biz.dal.entity.ExtensionOrder">
+		UPDATE extension_order
+		<set>
+			<if test="orderNo != null">
+				order_no_ = #{orderNo},
+			</if>
+			<if test="id != null">
+				id_ = #{id},
+			</if>
+			<if test="orderAmount != null">
+				order_amount_ = #{orderAmount},
+			</if>
+			<if test="updateTime != null">
+				update_time_ = #{updateTime},
+			</if>
+			<if test="extensionFee != null">
+				extension_fee_ = #{extensionFee},
+			</if>
+			<if test="orderType != null">
+				order_type_ = #{orderType},
+			</if>
+			<if test="extensionUserId != null">
+				extension_user_id_ = #{extensionUserId},
+			</if>
+			<if test="payTime != null">
+				pay_time_ = #{payTime},
+			</if>
+			<if test="createTime != null">
+				create_time_ = #{createTime},
+			</if>
+		</set>
+		WHERE id_ = #{id}
+	</update>
+
+	<!-- 根据主键删除一条记录 -->
+	<delete id="delete">
+		DELETE FROM extension_order WHERE id_ = #{id}
+	</delete>
+
+	<!-- 分页查询 -->
+	<select id="queryPage" resultMap="ExtensionOrder" parameterType="map">
+		SELECT eo.order_no_,eo.order_amount_, eo.order_type_,eo.pay_time_, ifnull(u.real_name_,u.username_) extension_user_,
+		eo.extension_fee_
+		FROM extension_order eo 
+		left join sys_user u on eo.extension_user_id_ = u.id_
+		<where>
+			<if test="extensionUserId != null">
+				and eo.extension_user_id_ = #{extensionUserId}
+			</if>
+			<if test="orderNo != null">
+				and eo.order_no_ = #{orderNo}
+			</if>
+		</where>
+		ORDER BY eo.order_no_ desc
+		<include refid="global.limit" />
+	</select>
+
+	<!-- 查询当前表的总记录数 -->
+	<select id="queryCount" resultType="int">
+		SELECT COUNT(*) FROM extension_order eo
+		<where>
+			<if test="extensionUserId != null">
+				and eo.extension_user_id_ = #{extensionUserId}
+			</if>
+			<if test="orderNo != null">
+				and eo.order_no_ = #{orderNo}
+			</if>
+		</where>
+	</select>
+</mapper>

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

@@ -540,6 +540,15 @@
         FROM student_payment_order
         WHERE order_no_ = #{orderNo}
     </select>
+    
+    <select id="findOrderByOrderNos" resultMap="StudentPaymentOrder">
+        SELECT *
+        FROM student_payment_order
+        WHERE order_no_ in 
+        <foreach collection="orderNoList" item="orderNo" index="index" open="(" close=")" separator=",">
+            #{orderNo}
+        </foreach>
+    </select>
 
     <select id="queryByDealStatus" resultMap="StudentPaymentOrder" parameterType="map">
         SELECT *

mec-thirdparty/src/main/java/com/ym/mec/thirdparty/adapay/SettleAccountService.java

@@ -32,7 +32,7 @@ public class SettleAccountService {
 		settleCountParams.put("member_id", accountInfo.getMemberId());
 		settleCountParams.put("app_id", appId);
 		settleCountParams.put("channel", "bank_account");
-		settleCountParams.put("account_info", accountInfo);
+		settleCountParams.put("account_info", accountInfoMap);
 		try {
 			Map<String, Object> resp = com.huifu.adapay.model.SettleAccount.create(settleCountParams, merchantKey);
 			if (StringUtils.equals("succeeded", resp.get("status").toString())) {

mec-web/src/main/java/com/ym/mec/web/controller/SwTempJcController.java

@@ -0,0 +1,77 @@
+package com.ym.mec.web.controller;
+
+import io.swagger.annotations.ApiOperation;
+
+import java.text.SimpleDateFormat;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+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.ExtensionOrder;
+import com.ym.mec.biz.dal.entity.StudentPaymentOrder;
+import com.ym.mec.biz.dal.page.CourseScheduleSWQueryInfo;
+import com.ym.mec.biz.dal.page.ExtensionSWQueryInfo;
+import com.ym.mec.biz.service.CourseScheduleSwService;
+import com.ym.mec.biz.service.ExtensionOrderService;
+import com.ym.mec.biz.service.StudentPaymentOrderService;
+import com.ym.mec.common.controller.BaseController;
+import com.ym.mec.common.page.PageInfo;
+
+@RequestMapping("swTempJc")
+@RestController
+public class SwTempJcController extends BaseController {
+
+	@Autowired
+	private CourseScheduleSwService courseScheduleSwService;
+	
+	@Autowired
+	private ExtensionOrderService extensionOrderService;
+	
+	@Autowired
+	private StudentPaymentOrderService studentPaymentOrderService;
+	
+	private SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+    @ApiOperation(value = "课表查询")
+    @GetMapping("/queryPageForCourseSchedule")
+    @PreAuthorize("@pcs.hasPermissions('swTempJc/queryPageForCourseSchedule')")
+    public Object queryPageForCourseSchedule(CourseScheduleSWQueryInfo queryInfo){
+        return succeed(courseScheduleSwService.queryPage(queryInfo));
+    }
+
+    @ApiOperation(value = "推广订单查询")
+    @GetMapping("/queryPageForExtensionOrder")
+    @PreAuthorize("@pcs.hasPermissions('swTempJc/queryPageForExtensionOrder')")
+    public Object queryPageForExtensionOrder(ExtensionSWQueryInfo queryInfo){
+    	
+    	PageInfo<ExtensionOrder> pageInfo = extensionOrderService.queryPage(queryInfo);
+    	
+    	List<ExtensionOrder> extensionOrderList = pageInfo.getRows();
+    	
+    	List<String> orderNoList = extensionOrderList.stream().map(t -> t.getOrderNo()).collect(Collectors.toList());
+    	
+    	if(orderNoList != null && orderNoList.size() > 0){
+    		
+    		Map<String,StudentPaymentOrder> map = studentPaymentOrderService.findOrderByOrderNos(orderNoList).stream().collect(Collectors.toMap(StudentPaymentOrder :: getOrderNo, Function.identity()));
+
+    		StudentPaymentOrder spo = null;
+        	for(ExtensionOrder eo : extensionOrderList){
+        		spo = map.get(eo.getOrderNo());
+        		if(spo == null){
+        			continue;
+        		}
+        		eo.setOrderAmount(spo.getExpectAmount());
+        		eo.setPayTime(sdf.format(spo.getPayTime()));
+        	}
+    	}
+    	
+        return succeed(pageInfo);
+    }
+}

mec-web/src/main/java/com/ym/mec/web/controller/TeacherController.java

@@ -55,6 +55,10 @@ public class TeacherController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('teacher/queryPage')")
     public HttpResponseResult<PageInfo<Teacher>> queryPage(TeacherQueryInfo queryInfo) {
         queryInfo.setOrganId(organizationService.getEmployeeOrgan(queryInfo.getOrganId()));
+        if(queryInfo.getTenantId() == 28){
+        	queryInfo.setTenantId(1);
+        	queryInfo.setOrganId(null);
+        }
         return succeed(teacherService.queryPageDetail(queryInfo));
     }