云教练活动

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

@@ -74,7 +74,7 @@ public interface CloudTeacherOrderDao extends BaseDAO<Long, CloudTeacherOrder> {
      * @param remark
      * @return
      */
-    List<CloudTeacherOrder> queryActiveOrderPage(@Param("userId") Integer userId,
+    String queryActiveOrderPage(@Param("userId") Integer userId,
                                                  @Param("activeRemark") Integer activeRemark,
                                                  @Param("remark") String remark);
 }

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

@@ -95,5 +95,5 @@ public interface CloudTeacherOrderService extends BaseService<Long, CloudTeacher
      * @param remark
      * @return
      */
-    List<CloudTeacherOrder> queryActiveOrderPage(Integer userId, Integer activeRemark, String remark);
+    String queryActiveOrderPage(Integer userId, Integer activeRemark, String remark);
 }

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

@@ -250,7 +250,7 @@ public class CloudTeacherOrderServiceImpl extends BaseServiceImpl<Long, CloudTea
     }
 
     @Override
-    public List<CloudTeacherOrder> queryActiveOrderPage(Integer userId, Integer activeRemark, String remark) {
+    public String queryActiveOrderPage(Integer userId, Integer activeRemark, String remark) {
         return cloudTeacherOrderDao.queryActiveOrderPage(userId,activeRemark,remark);
     }
 }

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

@@ -249,7 +249,7 @@
         <include refid="queryCloudTeacherActiveDetailSql"/>
     </select>
     <select id="queryActiveOrderPage" resultMap="CloudTeacherOrder">
-        SELECT cto.* FROM cloud_teacher_order cto
+        SELECT GROUP_CONCAT(DISTINCT cto.remark_) FROM cloud_teacher_order cto
         LEFT JOIN student_payment_order spo ON spo.id_ = cto.order_id_
         WHERE spo.status_ != 'FAILED' AND cto.active_remark_ = #{activeRemark}
         AND cto.student_id_ = #{userId}

mec-student/src/main/java/com/ym/mec/student/controller/SysCouponCodeController.java

@@ -34,4 +34,10 @@ public class SysCouponCodeController extends BaseController {
 		queryInfo.setUserId(sysUser.getId());
 		return succeed(sysCouponCodeService.querySysCouponUseList(queryInfo));
 	}
+
+	@ApiOperation("分页查询")
+	@RequestMapping(value = "queryPageAll")
+	public HttpResponseResult queryPageAll(SysCouponCodeQueryInfo queryInfo) {
+		return succeed(sysCouponCodeService.querySysCouponUseList(queryInfo));
+	}
 }