add:推广订单

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/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 java.util.Date 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(java.util.Date payTime){
+		this.payTime = payTime;
+	}
+	
+	public java.util.Date 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/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/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/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/resources/config/mybatis/CourseScheduleSwMapper.xml

@@ -89,7 +89,7 @@
 	<!-- 分页查询 -->
 	<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_ ORDER BY id_
+		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}
@@ -107,6 +107,7 @@
 				and date(cs.create_time_) &lt;= #{createEndDate}
 			</if>
 		</where>
+		ORDER BY cs.id_
 		<include refid="global.limit" />
 	</select>
 

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_,spo.expect_amount_ order_amount_, eo.order_type_,spo.pay_time_, ifnull(u.real_name_,u.username_) extension_user_,
+		eo.extension_fee_
+		FROM extension_order eo left join student_payment_order spo on eo.order_no_ = spo.order_no_
+		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.id_
+		<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-web/src/main/java/com/ym/mec/web/controller/CourseScheduleSwController.java

@@ -1,28 +0,0 @@
-package com.ym.mec.web.controller;
-
-import io.swagger.annotations.ApiOperation;
-
-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.page.CourseScheduleSWQueryInfo;
-import com.ym.mec.biz.service.CourseScheduleSwService;
-import com.ym.mec.common.controller.BaseController;
-
-@RequestMapping("courseScheduleSw")
-@RestController
-public class CourseScheduleSwController extends BaseController {
-
-	@Autowired
-	private CourseScheduleSwService courseScheduleSwService;
-
-    @ApiOperation(value = "课表查询")
-    @GetMapping("/queryPage")
-    @PreAuthorize("@pcs.hasPermissions('courseSchedule/queryPage')")
-    public Object queryPage(CourseScheduleSWQueryInfo queryInfo){
-        return succeed(courseScheduleSwService.queryPage(queryInfo));
-    }
-}

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

@@ -0,0 +1,40 @@
+package com.ym.mec.web.controller;
+
+import io.swagger.annotations.ApiOperation;
+
+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.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.common.controller.BaseController;
+
+@RequestMapping("swTempJc")
+@RestController
+public class SwTempJcController extends BaseController {
+
+	@Autowired
+	private CourseScheduleSwService courseScheduleSwService;
+	
+	@Autowired
+	private ExtensionOrderService extensionOrderService;
+
+    @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){
+        return succeed(extensionOrderService.queryPage(queryInfo));
+    }
+}