fengji 团练宝缴费激活

.gitignore

@@ -11,4 +11,4 @@ bin
 .idea
 *.iml
 /lib/
-/mec-web/src/main/resources/rebel.xml
+rebel.xml

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

@@ -96,11 +96,11 @@ public interface CloudTeacherOrderDao extends BaseDAO<Long, CloudTeacherOrder> {
 
     List<CloudTeacherStudent> queryInactive(Map<String, Object> params);
 
-    int updateOrderStatusOK(@Param("orderId") Integer orderId);
+    int updateOrderStatusOK(@Param("platformOrderId") Integer platformOrderId);
 
     int updateOrderId(@Param("cloudTeacherOrderId")Integer cloudTeacherOrderId,
                       @Param("amount") BigDecimal amount,
-                      @Param("orderId")Integer orderId);
+                      @Param("platformOrderId")Integer platformOrderId);
 
     int findRecordCount(Map<String, Object> params);
 

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

@@ -81,6 +81,12 @@ public class CloudTeacherOrder extends BaseEntity {
     private Long orderId;
 
     /**
+     * 平台订单id
+     */
+    @ApiModelProperty(value = "订单id")
+    private Long platformOrderId;
+
+    /**
      * 备注
      */
     @ApiModelProperty(value = "备注")
@@ -248,6 +254,7 @@ public class CloudTeacherOrder extends BaseEntity {
         sb.append(", refundAmount=").append(refundAmount);
         sb.append(", status=").append(status);
         sb.append(", orderId=").append(orderId);
+        sb.append(", platformOrderId=").append(platformOrderId);
         sb.append(", remark=").append(remark);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
@@ -278,4 +285,20 @@ public class CloudTeacherOrder extends BaseEntity {
 	public void setStudentPaymentOrder(StudentPaymentOrder studentPaymentOrder) {
 		this.studentPaymentOrder = studentPaymentOrder;
 	}
+
+    public Long getPlatformOrderId() {
+        return platformOrderId;
+    }
+
+    public void setPlatformOrderId(Long platformOrderId) {
+        this.platformOrderId = platformOrderId;
+    }
+
+    public Integer getVersion() {
+        return version;
+    }
+
+    public void setVersion(Integer version) {
+        this.version = version;
+    }
 }

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.ym.mec.biz.dal.enums.PeriodEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -36,20 +37,52 @@ public class CloudTeacherStudent {
     @ApiModelProperty(value = "所属分部")
     private String organName;
 
-    @ApiModelProperty(value = "乐团编号")
-    private String musicGroupId;
+    @ApiModelProperty(value = "团练宝类型")
+    private PeriodEnum type;
 
-    @ApiModelProperty(value = "乐团名称")
-    private String musicGroupName;
+    @ApiModelProperty(value = "团练宝类型名称")
+    private String typeName;
 
-    @ApiModelProperty(value = "合作单位")
-    private String cooperationOrganName;
+    @ApiModelProperty(value = "流水号")
+    private String transNo;
 
-    @ApiModelProperty(value = "团练宝类型")
-    private Integer type;
+    @ApiModelProperty(value = "订单号")
+    private String orderNo;
 
-    @ApiModelProperty(value = "团练宝类型")
-    private String typeName;
+    @ApiModelProperty(value = "订单时间")
+    private String orderTime;
+
+    @ApiModelProperty(value = "金额")
+    private BigDecimal amount;
+
+    @ApiModelProperty(value = "数量")
+    private Integer time;
+
+    // ------------------------------------------------------------------------------------------
+
+    public String getTransNo() {
+        return transNo;
+    }
+
+    public void setTransNo(String transNo) {
+        this.transNo = transNo;
+    }
+
+    public String getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(String orderNo) {
+        this.orderNo = orderNo;
+    }
+
+    public String getOrderTime() {
+        return orderTime;
+    }
+
+    public void setOrderTime(String orderTime) {
+        this.orderTime = orderTime;
+    }
 
     public String getTypeName() {
         return typeName;
@@ -59,11 +92,6 @@ public class CloudTeacherStudent {
         this.typeName = typeName;
     }
 
-    @ApiModelProperty(value = "数量")
-    private Integer time;
-
-    @ApiModelProperty(value = "金额")
-    private BigDecimal amount;
 
     public Integer getTenantId() {
         return tenantId;
@@ -105,19 +133,11 @@ public class CloudTeacherStudent {
         this.phone = phone;
     }
 
-    public BigDecimal getAmount() {
-        return amount;
-    }
-
-    public void setAmount(BigDecimal amount) {
-        this.amount = amount;
-    }
-
-    public Integer getType() {
+    public PeriodEnum getType() {
         return type;
     }
 
-    public void setType(Integer type) {
+    public void setType(PeriodEnum type) {
         this.type = type;
     }
 
@@ -153,27 +173,11 @@ public class CloudTeacherStudent {
         this.organName = organName;
     }
 
-    public String getMusicGroupId() {
-        return musicGroupId;
-    }
-
-    public void setMusicGroupId(String musicGroupId) {
-        this.musicGroupId = musicGroupId;
-    }
-
-    public String getMusicGroupName() {
-        return musicGroupName;
-    }
-
-    public void setMusicGroupName(String musicGroupName) {
-        this.musicGroupName = musicGroupName;
-    }
-
-    public String getCooperationOrganName() {
-        return cooperationOrganName;
+    public BigDecimal getAmount() {
+        return amount;
     }
 
-    public void setCooperationOrganName(String cooperationOrganName) {
-        this.cooperationOrganName = cooperationOrganName;
+    public void setAmount(BigDecimal amount) {
+        this.amount = amount;
     }
 }

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

@@ -8,7 +8,6 @@ import java.util.List;
 
 public class CloudTeacherAddQueryInfo extends QueryInfo {
 
-
 	@ApiModelProperty(value = "学生编号数组")
 	private List<Integer> studentIds;
 

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

@@ -3,9 +3,15 @@ package com.ym.mec.biz.dal.page;
 import io.swagger.annotations.ApiModelProperty;
 
 import com.ym.mec.common.page.QueryInfo;
+import org.joda.time.DateTime;
+
+import java.util.Date;
 
 public class CloudTeacherOrderQueryInfo extends QueryInfo {
 
+	@ApiModelProperty(value = "乐团Id")
+	private String musicGroupId;
+
 	@ApiModelProperty(value = "交易状态(0-待生效 1-生效中 2-已生效 3-已退)")
 	private Integer status;
 
@@ -15,9 +21,35 @@ public class CloudTeacherOrderQueryInfo extends QueryInfo {
 	@ApiModelProperty(value = "学员姓名/编号/电话")
 	private String queryCondition;
 
+
+	@ApiModelProperty(value = "订单号")
+	private String orderNo;
+
 	@ApiModelProperty(value = "声部Id")
 	private Integer subjectId;
 
+	@ApiModelProperty(value = "开始时间")
+	private Date startTime;
+
+	public Date getStartTime() {
+		return startTime;
+	}
+
+	public void setStartTime(Date startTime) {
+		this.startTime = startTime;
+	}
+
+	public Date getEndTime() {
+		return endTime;
+	}
+
+	public void setEndTime(Date endTime) {
+		this.endTime = endTime;
+	}
+
+	@ApiModelProperty(value = "结束时间")
+	private Date endTime;
+
 	public Integer getStatus() {
 		return status;
 	}
@@ -49,4 +81,20 @@ public class CloudTeacherOrderQueryInfo extends QueryInfo {
 	public void setSubjectId(Integer subjectId) {
 		this.subjectId = subjectId;
 	}
+
+	public String getOrderNo() {
+		return orderNo;
+	}
+
+	public void setOrderNo(String orderNo) {
+		this.orderNo = orderNo;
+	}
+
+	public String getMusicGroupId() {
+		return musicGroupId;
+	}
+
+	public void setMusicGroupId(String musicGroupId) {
+		this.musicGroupId = musicGroupId;
+	}
 }

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

@@ -114,7 +114,7 @@ public interface CloudTeacherOrderService extends BaseService<Long, CloudTeacher
 
     Boolean payCheck(String orderNo);
 
-    PageInfo<CloudTeacherStudent> queryActiveRecord(CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo);
+    PageInfo<CloudTeacherStudent> queryRecord(CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo);
 
     boolean addStudents(CloudTeacherAddQueryInfo cloudTeacherAddQueryInfo);
 }

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

@@ -32,6 +32,8 @@ import org.springframework.transaction.annotation.Transactional;
 import java.math.BigDecimal;
 import java.util.*;
 
+import static com.ym.mec.biz.dal.enums.PeriodEnum.*;
+
 @Service
 public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTeacherOrder> implements CloudTeacherOrderService {
     private static final Logger log = LoggerFactory.getLogger(TenantInfoServiceImpl.class);
@@ -63,6 +65,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             cloudTeacherOrder.setStudentId(stId);
             cloudTeacherOrder.setTime(cloudTeacherAddQueryInfo.getTimes());
             cloudTeacherOrder.setType(cloudTeacherAddQueryInfo.getAddType());
+            cloudTeacherOrder.setLevel(1);
             cloudTeacherOrderDao.insert(cloudTeacherOrder);
             this.addStudentCloudTeacher(cloudTeacherOrder);
         }
@@ -70,7 +73,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
     }
 
     @Override
-    public PageInfo<CloudTeacherStudent> queryActiveRecord(CloudTeacherOrderQueryInfo queryInfo) {
+    public PageInfo<CloudTeacherStudent> queryRecord(CloudTeacherOrderQueryInfo queryInfo) {
         PageInfo<CloudTeacherStudent> pageInfo = new PageInfo<>(queryInfo.getPage(), queryInfo.getRows());
         Map<String, Object> params = new HashMap<>();
         MapUtil.populateMap(params, queryInfo);
@@ -118,19 +121,19 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             JSONObject memberConfig = (JSONObject) cfg.get("member_config");
             Double divide;
             switch (cst.getType()) {
-                case 1:
+                case DAY:
                     divide = memberConfig.getDouble("day_divide");
                     break;
-                case 2:
+                case MONTH:
                     divide = memberConfig.getDouble("month_divide");
                     break;
-                case 3:
+                case QUARTERLY:
                     divide = memberConfig.getDouble("quarter_divide");
                     break;
-                case 4:
+                case YEAR_HALF:
                     divide = memberConfig.getDouble("half_year_divide");
                     break;
-                case 5:
+                case YEAR:
                     divide = memberConfig.getDouble("year_divide");
                     break;
                 default:
@@ -221,7 +224,6 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
             //            DealStatusEnum
             //            notifyMap.put("totalMoney", notifyMap.get("payAmount"));
             log.info("tenant orderNotify update order status start" + record.getId().toString());
-
             cloudTeacherOrderDao.updateOrderStatusOK(record.getId());
             log.info("tenant orderNotify update order status end");
             record.setOrderState(1);
@@ -328,15 +330,15 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
     }
 
     private Date calcCloudTeacherOrderTime(CloudTeacherOrder cloudTeacherOrder, Date startTime, Date endTime) {
-        if (cloudTeacherOrder.getType().equals(1)) { // 日
+        if (cloudTeacherOrder.getType() == DAY) { // 日
             endTime = DateUtil.addDays(startTime, cloudTeacherOrder.getTime());
-        } else if (cloudTeacherOrder.getType().equals(2)) { // 月
+        } else if (cloudTeacherOrder.getType() == MONTH) { // 月
             endTime = DateUtil.addMonths(startTime, cloudTeacherOrder.getTime());
-        } else if (cloudTeacherOrder.getType().equals(3)) { // 季
+        } else if (cloudTeacherOrder.getType() == QUARTERLY) { // 季
             endTime = DateUtil.addMonths(startTime, cloudTeacherOrder.getTime() * 3);
-        } else if (cloudTeacherOrder.getType().equals(4)) { // 半年
+        } else if (cloudTeacherOrder.getType() == YEAR_HALF) { // 半年
             endTime = DateUtil.addMonths(startTime, cloudTeacherOrder.getTime() * 6);
-        } else if (cloudTeacherOrder.getType().equals(5)) { // 年
+        } else if (cloudTeacherOrder.getType() == YEAR) { // 年
             endTime = DateUtil.addYears(startTime, cloudTeacherOrder.getTime());
         }
         return endTime;

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

@@ -16,6 +16,7 @@
         <result column="start_time_" property="startTime"/>
         <result column="end_time_" property="endTime"/>
         <result column="order_id_" property="orderId"/>
+        <result column="platform_order_id_" property="platformOrderId"/>
         <result column="remark_" property="remark"/>
         <result column="active_remark_" property="activeRemark"/>
         <result column="version_" property="version"/>
@@ -38,6 +39,7 @@
         <result column="start_time_" property="cloudTeacherOrder.startTime"/>
         <result column="end_time_" property="cloudTeacherOrder.endTime"/>
         <result column="order_id_" property="cloudTeacherOrder.orderId"/>
+        <result column="platform_order_id_" property="cloudTeacherOrder.platformOrderId"/>
         <result column="trans_status_" property="studentPaymentOrder.status"/>
         <result column="expect_amount_" property="studentPaymentOrder.expectAmount"/>
         <result column="pay_time_" property="studentPaymentOrder.payTime"/>
@@ -60,9 +62,9 @@
             useGeneratedKeys="true">
         <!--@mbg.generated-->
         insert into cloud_teacher_order (organ_id_,student_id_, type_, level_, time_, amount_, refund_amount_, status_,
-        order_id_,start_time_,end_time_,remark_, create_time_, update_time_,music_group_id_,active_remark_,tenant_id_)
+        order_id_,platform_order_id_,start_time_,end_time_,remark_, create_time_, update_time_,music_group_id_,active_remark_,tenant_id_)
         values (#{organId},#{studentId}, #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{level}, #{time}, #{amount}, #{refundAmount},
-        #{status},#{orderId},#{startTime},#{endTime}, #{remark}, NOW(), NOW(),#{musicGroupId},#{activeRemark},#{tenantId})
+        #{status},#{orderId},#{platformOrderId},#{startTime},#{endTime}, #{remark}, NOW(), NOW(),#{musicGroupId},#{activeRemark},#{tenantId})
     </insert>
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.CloudTeacherOrder">
         <!--@mbg.generated-->
@@ -107,6 +109,9 @@
             <if test="orderId != null">
                 order_id_ = #{orderId},
             </if>
+            <if test="platformOrderId != null">
+                platform_order_id_ = #{platformOrderId},
+            </if>
             <if test="remark != null">
                 remark_ = #{remark},
             </if>
@@ -117,11 +122,20 @@
     </update>
 
     <update id="updateOrderStatusOK">
-        update cloud_teacher_order set status_ = 2 where order_id_ = (#{orderId})
+        update cloud_teacher_order set status_ = 2,
+       `start_time_` = CURRENT_DATE(),
+       `end_time_` = case
+         when type_ = 1 then date_add(CURRENT_DATE(), interval `time_` day)
+         when type_ = 2 then date_add(CURRENT_DATE(), interval `time_` month)
+         when type_ = 3 then date_add(CURRENT_DATE(), interval `time_` * 3 month)
+         when type_ = 4 then date_add(CURRENT_DATE(), interval `time_` * 6 month)
+         when type_ = 5 then date_add(CURRENT_DATE(), interval `time_` * 12 month)
+        end
+        where platform_order_id_ = (#{platformOrderId})
     </update>
     <update id="updateOrderId">
         update cloud_teacher_order
-        set order_id_ = #{orderId} , pay_amount_ = #{amount}
+        set platform_order_id_ = #{platformOrderId} , pay_amount_ = #{amount}
         where id_ = #{cloudTeacherOrderId}
     </update>
 
@@ -292,7 +306,12 @@
         GROUP BY student_id_
     </select>
 
-    <select id="queryInactive" resultType="com.ym.mec.biz.dal.entity.CloudTeacherStudent">
+    <resultMap id="cloudTeacherStudent" type="com.ym.mec.biz.dal.entity.CloudTeacherStudent">
+        <result property="type" column="type" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler" />
+    </resultMap>
+
+    <!-- 查询激活或未激活记录 -->
+    <select id="queryInactive" resultMap="cloudTeacherStudent">
         select
                cto.id_ as cloudTeacherOrderId,
                cto.student_id_ as studentId,
@@ -307,25 +326,18 @@
                end as typeName,
                cto.time_ as time,
                sj.id_ as subject,
-               sj.name_ as subjectLabel,
+               sj.name_ as subjectName,
                u.tenant_id_ as tenantId,
                u.username_ as name,
-               u.phone_ as phone,
-               org.name_ as organName,
-               mg.id_ as musicGroupId,
-               mg.name_ as musicGroupName,
-               coo.name_ as cooperationOrganName
+               u.phone_ as phone
         from cloud_teacher_order cto
         left join student s on cto.student_id_ = s.user_id_
         left join sys_user u on cto.student_id_ = u.id_
         left join subject sj on s.subject_id_list_ = sj.id_
-        left join student_registration sr on cto.student_id_ = sr.user_id_
-        left join music_group mg on sr.music_group_id_ = mg.id_
-        left join cooperation_organ coo on mg.cooperation_organ_id_ = coo.id_
-        left join organization org on mg.organ_id_ = org.id_
+        left join student_registration sr ON cto.student_id_ = sr.user_id_
         <where>
-            cto.status_ = #{status} AND sr.music_group_status_ = 'NORMAL' AND mg.status_ = 'PROGRESS'
-            <if test="queryCondition != nul and queryCondition != ''">
+            cto.status_ = #{status} AND sr.music_group_id_ = #{musicGroupId}
+            <if test="queryCondition != null and queryCondition != ''">
                 AND (u.username_ LIKE CONCAT('%', #{queryCondition}, '%') or u.phone_ = #{queryCondition} or u.id_ = #{queryCondition})
             </if>
             <if test="subjectId">
@@ -340,13 +352,10 @@
         left join student s on cto.student_id_ = s.user_id_
         left join sys_user u on cto.student_id_ = u.id_
         left join subject sj on s.subject_id_list_ = sj.id_
-        left join student_registration sr on s.user_id_ = sr.user_id_
-        left join music_group mg on sr.music_group_id_ = mg.id_
-        left join cooperation_organ coo on mg.cooperation_organ_id_ = coo.id_
-        left join organization org on mg.organ_id_ = org.id_
+        left join student_registration sr ON cto.student_id_ = sr.user_id_
         <where>
-            cto.status_ = #{status} AND sr.music_group_status_ = 'NORMAL' AND mg.status_ = 'PROGRESS'
-            <if test="queryCondition != nul and queryCondition != ''">
+            cto.status_ = #{status} AND sr.music_group_id_ = #{musicGroupId}
+            <if test="queryCondition != null and queryCondition != ''">
                 AND (u.username_ LIKE CONCAT('%', #{queryCondition}, '%') or u.phone_ = #{queryCondition} or u.id_ = #{queryCondition})
             </if>
             <if test="subjectId">
@@ -354,22 +363,26 @@
             </if>
         </where>
     </select>
+
+    <!-- 查询订单记录 -->
     <select id="findRecordCount" resultType="java.lang.Integer">
         SELECT count(1) FROM cloud_teacher_order cto
-        LEFT JOIN tenant_order_record tor ON tor.id_ = cto.order_id_
+        LEFT JOIN tenant_order_record tor ON tor.id_ = cto.platform_order_id_
         LEFT JOIN student s ON cto.student_id_ = s.user_id_
         LEFT JOIN sys_user u ON cto.student_id_ = u.id_
         LEFT JOIN SUBJECT sj ON s.subject_id_list_ = sj.id_
         LEFT JOIN student_registration sr ON cto.student_id_ = sr.user_id_
         LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
         <where>
-            cto.status_ = 2 AND sr.music_group_status_ = 'NORMAL' AND mg.status_ = 'PROGRESS' and tor.order_no_ is not null
-            AND cto.type_ > 1
+            cto.status_ = 2 AND tor.order_no_ is not null AND tor.order_type_ = 'CLOUD_TEACHER'
+            AND sr.music_group_id_ = #{musicGroupId}
+            <if test="queryCondition != null and queryCondition != ''">
+                AND (u.username_ LIKE CONCAT('%', #{queryCondition}, '%') or u.phone_ = #{queryCondition} or u.id_ = #{queryCondition})
+            </if>
         </where>
     </select>
-    <select id="queryRecord" resultType="com.ym.mec.biz.dal.entity.CloudTeacherStudent">
+    <select id="queryRecord"  resultMap="cloudTeacherStudent">
         SELECT
-            tor.order_no_ as orderNo,
             cto.id_ AS cloudTeacherOrderId,
             cto.student_id_ AS studentId,
             cto.type_ AS type,
@@ -380,22 +393,34 @@
                 WHEN 5 THEN '年' ELSE ''
                 END AS typeName,
             cto.time_ AS time,
-            sj.id_ AS SUBJECT,
+            sj.id_ AS subject,
             sj.name_ AS subjectName,
             u.tenant_id_ AS tenantId,
-            u.username_ AS NAME,
-            u.phone_ AS phone
-        FROM
-            cloud_teacher_order cto
-                LEFT JOIN tenant_order_record tor ON tor.id_ = cto.order_id_
-                LEFT JOIN student s ON cto.student_id_ = s.user_id_
-                LEFT JOIN sys_user u ON cto.student_id_ = u.id_
-                LEFT JOIN SUBJECT sj ON s.subject_id_list_ = sj.id_
-                LEFT JOIN student_registration sr ON cto.student_id_ = sr.user_id_
-                LEFT JOIN music_group mg ON sr.music_group_id_ = mg.id_
+            u.username_ AS name,
+            u.phone_ AS phone,
+            tor.order_no_ as orderNo,
+            tor.trans_no_ as transNo,
+            tor.created_time_ as orderTime
+        FROM cloud_teacher_order cto
+        LEFT JOIN tenant_order_record tor ON tor.id_ = cto.platform_order_id_
+        LEFT JOIN student s ON cto.student_id_ = s.user_id_
+        LEFT JOIN sys_user u ON cto.student_id_ = u.id_
+        LEFT JOIN subject sj ON s.subject_id_list_ = sj.id_
         <where>
-            cto.status_ = 2 AND sr.music_group_status_ = 'NORMAL' AND mg.status_ = 'PROGRESS' and tor.order_no_ is not null
-            AND cto.type_ > 1
+            cto.status_ = 2 AND tor.order_no_ is not null AND tor.order_type_ = 'CLOUD_TEACHER'
+            AND sr.music_group_id_ = #{musicGroupId}
+            <if test="queryCondition != null and queryCondition != ''">
+                AND (u.username_ LIKE CONCAT('%', #{queryCondition}, '%') or u.phone_ = #{queryCondition} or u.id_ = #{queryCondition})
+            </if>
+            <if test="orderNo != null and orderNo != ''">
+                AND tor.order_no_ = #{orderNo}
+            </if>
+            <if test="startTime != null and startTime != ''">
+                <![CDATA[ AND tor.created_time_ >= #{startTime} ]]>
+            </if>
+            <if test="endTime != null and startTime != ''">
+                <![CDATA[ AND tor.created_time_ <= #{endTime} ]]>
+            </if>
         </where>
         <include refid="global.limit"/>
     </select>

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

@@ -31,22 +31,28 @@ public class CloudTeacherOrderController extends BaseController {
     @ApiOperation(value ="手动添加会员")
     @PostMapping("/addStudents")
     // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/addStudents')")
-    public Object addStudents(@RequestBody CloudTeacherAddQueryInfo cloudTeacherAddQueryInfo) throws Exception {
+    public Object addStudents(@RequestBody CloudTeacherAddQueryInfo cloudTeacherAddQueryInfo) {
         return succeed(cloudTeacherOrderService.addStudents(cloudTeacherAddQueryInfo));
     }
 
     @ApiOperation(value ="查询未激活团练宝用户")
     @PostMapping("/queryInactive")
     // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryUnActive')")
-    public Object queryInactive(CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
+    public Object queryInactive(@RequestBody CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
         cloudTeacherOrderQueryInfo.setStatus(1);
+        if (cloudTeacherOrderQueryInfo.getMusicGroupId() == null) {
+            throw new Exception("乐团Id必须填写");
+        }
         return succeed(cloudTeacherOrderService.queryInactive(cloudTeacherOrderQueryInfo));
     }
 
     @ApiOperation(value ="查询已激活团练宝用户")
     @PostMapping("/queryActive")
     // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryActive')")
-    public Object queryActive(CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
+    public Object queryActive(@RequestBody CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) throws Exception {
+        if (cloudTeacherOrderQueryInfo.getMusicGroupId() == null) {
+            throw new Exception("乐团Id必须填写");
+        }
         cloudTeacherOrderQueryInfo.setStatus(2);
         return succeed(cloudTeacherOrderService.queryInactive(cloudTeacherOrderQueryInfo));
     }
@@ -55,7 +61,7 @@ public class CloudTeacherOrderController extends BaseController {
     @PostMapping("/queryActiveRecord")
     // @PreAuthorize("@pcs.hasPermissions('cloudTeacherOrder/queryActiveRecord')")
     public Object queryActiveRecord(CloudTeacherOrderQueryInfo cloudTeacherOrderQueryInfo) {
-        return succeed(cloudTeacherOrderService.queryActiveRecord(cloudTeacherOrderQueryInfo));
+        return succeed(cloudTeacherOrderService.queryRecord(cloudTeacherOrderQueryInfo));
     }
 
     @ApiOperation(value ="测试支付通知")