1

src/main/java/com/ym/mec/collectfee/controller/OrderController.java

@@ -36,8 +36,8 @@ public class OrderController extends BaseController {
     @PostMapping("/checkOrderList")
 //  @ApiOperation(value = "根据学生编号，获取订单列表")
 //  @ApiImplicitParams({ @ApiImplicitParam(name = "classId", value = "乐团编号", required = true, dataType = "Integer")})
-	  public Object checkOrders(Integer classId, Integer type, String voicyPart, String startTime, String endTime, Integer branchId){
-	      return succeed(orderService.getOrderByClassId(classId,type,voicyPart,startTime,endTime,branchId));
+	  public Object checkOrders(Integer account, Integer classId, Integer type, String voicyPart, String startTime, String endTime, Integer branchId){
+	      return succeed(orderService.getOrderByClassId(account,classId,type,voicyPart,startTime,endTime,branchId));
     }
 
     @PostMapping("/orderListPage")

src/main/java/com/ym/mec/collectfee/dao/OrderDao.java

@@ -16,7 +16,7 @@ public interface OrderDao extends BaseDAO<Integer, Order> {
 
     List<Order> getOrderByUserId(Integer userId);
 
-    List<Order> getOrderByClassId(@Param("classId") Integer classId,@Param("type") Integer type, @Param("voicyPart")String voicyPart, @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("branchId") Integer branchId);
+    List<Order> getOrderByClassId(@Param("account") Integer account,@Param("classId") Integer classId,@Param("type") Integer type, @Param("voicyPart")String voicyPart, @Param("startTime") String startTime, @Param("endTime") String endTime,@Param("branchId") Integer branchId);
 
     List<Order> getOrderByBatch(String batchNum);
 

src/main/java/com/ym/mec/collectfee/service/OrderService.java

@@ -27,7 +27,7 @@ public interface OrderService extends BaseService<Integer, Order> {
      * @param userId
      * @return
      */
-    List<Order> getOrderByClassId(Integer classId, Integer type, String voicyPart,String startTime,String endTime, Integer branchId);
+    List<Order> getOrderByClassId(Integer account, Integer classId, Integer type, String voicyPart,String startTime,String endTime, Integer branchId);
 
 
     /**

src/main/java/com/ym/mec/collectfee/service/impl/OrderServiceImpl.java

@@ -180,8 +180,8 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
     }
 
     @Override
-    public List<Order> getOrderByClassId(Integer classId, Integer type, String voicyPart, String startTime, String endTime, Integer branchId) {
-        return orderDao.getOrderByClassId(classId, type, voicyPart, startTime, endTime, branchId);
+    public List<Order> getOrderByClassId(Integer account, Integer classId, Integer type, String voicyPart, String startTime, String endTime, Integer branchId) {
+        return orderDao.getOrderByClassId(account,classId, type, voicyPart, startTime, endTime, branchId);
     }
 
     public static void main(String[] args) {

src/main/resources/config/mybatis/OrderMapper.xml

@@ -164,6 +164,9 @@
         <if test="voicyPart != null">
             and voicy_part like '%${voicyPart}%'
         </if>
+        <if test="account != null">
+           and account = #{account}
+        </if>
         <if test="startTime != null and startTime != ''">
             <![CDATA[ and pay_time >= ]]>#{startTime}
         </if>