订单增加时间过滤,增加关闭缴费功能

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

@@ -34,8 +34,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){
-	      return succeed(orderService.getOrderByClassId(classId,type,voicyPart));
+	  public Object checkOrders(Integer classId, Integer type, String voicyPart, String startTime, String endTime){
+	      return succeed(orderService.getOrderByClassId(classId,type,voicyPart,startTime,endTime));
 	  }
 
     /**

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

@@ -221,7 +221,6 @@ public class UserController extends BaseController {
 //    @ApiOperation(value = "开启乐团缴费功能")
     @PostMapping("/openClassPay")
     public Object openClassPay(Integer id, String smsMsg, int type, int isSingle) {//1是线上 2 线下
-        //isSingle 0 单乐器 1非单乐器
         if (id == null || (isSingle > 1 || isSingle < 0) || (type == 2 && StringUtils.isEmpty(smsMsg))) {
             return failed(Constants.PARAM_VERIFY_ERROR_MSG);
         }
@@ -231,6 +230,23 @@ public class UserController extends BaseController {
 
 
     /**
+     * 关闭乐团缴费
+     *
+     * @return
+     */
+//    @ApiOperation(value = "关闭乐团缴费功能")
+    @PostMapping("/closeClassPay")
+    public Object closeClassPay(Integer id) {
+        if (id == null ) {
+            return failed(Constants.PARAM_VERIFY_ERROR_MSG);
+        }
+        School school = schoolService.get(id);
+        school.setStatus(5);
+        return succeed(schoolService.update(school));
+    }
+
+
+    /**
      * 修改学生信息
      *
      * @return

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

@@ -74,6 +74,7 @@ public class YqPayController extends BaseController {
     public Object toPay(@ModelAttribute @Validated Order order) throws Exception {
         BigDecimal amount = new BigDecimal("0");
         School school = schoolService.get(order.getClassId());
+
         //计划招生人数有更新，更新
         orderService.getSchoolDetail(school.getSchoolId());
 
@@ -88,6 +89,10 @@ public class YqPayController extends BaseController {
             return failed(HttpStatus.CONTINUE, "您有待支付的订单");
         }
 
+        if (!school.getStatus().equals(2)) {
+            return failed("乐团不在缴费状态！");
+        }
+
         //1、判断已报名人数
         CourseGroupInfo courseGroupInfo = CourseGroupInfoService.get(order.getCourseId());
         if (courseGroupInfo.getRegNum().compareTo(courseGroupInfo.getPlanNum()) >= 0) {
@@ -507,7 +512,7 @@ public class YqPayController extends BaseController {
     }
 
 
-    @Scheduled(cron = "0/5 * * * * ?")
+    // @Scheduled(cron = "0/5 * * * * ?")
     //@RequestMapping("/getOrderStatus")
     public void getOrderStatus() throws Exception {
 

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

@@ -13,8 +13,8 @@ import java.util.Map;
 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);
+
+    List<Order> getOrderByClassId(@Param("classId") Integer classId,@Param("type") Integer type, @Param("voicyPart")String voicyPart, @Param("startTime") String startTime, @Param("endTime") String endTime);
 
     List<Order> getOrderByBatch(String batchNum);
 

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

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

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

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

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

@@ -38,13 +38,15 @@
 
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="Order">
-		SELECT * FROM `order` WHERE `id` = #{id}
-	</select>
+        SELECT * FROM `order` WHERE `id` = #{id}
+    </select>
 
     <!-- 全查询 -->
     <select id="findAll" resultMap="Order">
-		SELECT * FROM `order` ORDER BY id
-	</select>
+        SELECT *
+        FROM `order`
+        ORDER BY id
+    </select>
 
     <!-- 向数据库增加一条记录 -->
     <insert id="insert" parameterType="com.ym.mec.collectfee.entity.Order" useGeneratedKeys="true" keyColumn="id"
@@ -129,8 +131,8 @@
 
     <!-- 根据主键删除一条记录 -->
     <delete id="delete">
-		DELETE FROM `order` WHERE id = #{id}
-	</delete>
+        DELETE FROM `order` WHERE id = #{id}
+    </delete>
 
     <!-- 分页查询 -->
     <select id="queryPage" resultMap="Order" parameterType="map">
@@ -140,12 +142,13 @@
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-		SELECT COUNT(*) FROM `order`
-	</select>
+        SELECT COUNT(*)
+        FROM `order`
+    </select>
 
     <select id="getOrderByUserId" resultMap="Order">
-		SELECT * FROM `order` WHERE user_id = #{userId}
-	</select>
+        SELECT * FROM `order` WHERE user_id = #{userId}
+    </select>
 
     <select id="getOrderByClassId" resultMap="Order">
         SELECT * FROM `order` WHERE status=2
@@ -158,33 +161,44 @@
         <if test="voicyPart != null">
             and voicy_part like '%${voicyPart}%'
         </if>
+        <if test="startTime != null and startTime != ''">
+            <![CDATA[ and pay_time >= ]]>#{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            <![CDATA[ and pay_time <= ]]>#{endTime}
+        </if>
     </select>
 
     <select id="getOrderByBatch" resultMap="Order">
-		SELECT * FROM `order` WHERE `batch_num` = #{batchNum}
-	</select>
+        SELECT * FROM `order` WHERE `batch_num` = #{batchNum}
+    </select>
     <select id="countOrder" resultType="java.lang.Integer">
-		SELECT COUNT(DISTINCT user_id) num FROM `order` WHERE `po_name` = #{poName} AND `voicy_part` = #{voicePort} AND `status` >= 1
-	</select>
+        SELECT COUNT(DISTINCT user_id) num FROM `order` WHERE `po_name` = #{poName} AND `voicy_part` = #{voicePort} AND
+        `status` >= 1
+    </select>
 
     <select id="getOrderByOrderNo" resultMap="Order">
-		SELECT * FROM `order` WHERE `order_no` = #{orderNo} AND `status` = 1
-	</select>
+        SELECT * FROM `order` WHERE `order_no` = #{orderNo} AND `status` = 1
+    </select>
     <select id="findOrderByStatus" resultMap="Order">
-		SELECT * FROM `order` WHERE `user_id` = #{userId} AND `status` = #{status}
-	</select>
+        SELECT * FROM `order` WHERE `user_id` = #{userId} AND `status` = #{status}
+    </select>
     <!-- 获取支付中和成功的订单数-->
     <select id="getPayOrderNums" resultType="java.lang.Integer">
-		SELECT COUNT(*) FROM `order` WHERE `status` >= 1
-	</select>
+        SELECT COUNT(*)
+        FROM `order`
+        WHERE `status` >= 1
+    </select>
     <!-- 获取支付中的订单-->
     <select id="findPayingOrders" resultMap="Order">
-		SELECT * FROM `order` WHERE `status` = 1
-	</select>
+        SELECT *
+        FROM `order`
+        WHERE `status` = 1
+    </select>
     <!-- 获取支付中和成功的订单数-->
     <select id="getPayingOrderNums" resultType="java.lang.Integer" parameterType="java.lang.Integer">
-		SELECT COUNT(*) FROM `order` WHERE `group_id`= #{groupId} AND `status` = 1
-	</select>
+        SELECT COUNT(*) FROM `order` WHERE `group_id`= #{groupId} AND `status` = 1
+    </select>
 
     <!-- 根据id和status更新订单 -->
     <update id="updateByIdAndStatus" parameterType="map">
@@ -220,6 +234,6 @@
 
     <!-- 乐团报名缴费订单 -->
     <select id="findRegOrderByStatus" resultMap="Order">
-		SELECT * FROM `order` WHERE `user_id` = #{userId} AND `type`=1 AND `status` = #{status}
-	</select>
+        SELECT * FROM `order` WHERE `user_id` = #{userId} AND `type`=1 AND `status` = #{status}
+    </select>
 </mapper>