重新支付订单

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

@@ -77,13 +77,13 @@ public class YqPayController extends BaseController {
         //计划招生人数有更新，更新
         orderService.getSchoolDetail(school.getSchoolId());
 
-        Order userOrder = orderService.findOrderByStatus(order.getUserId(), 2);
+        Order userOrder = orderService.findRegOrderByStatus(order.getUserId(), 2);
         if (userOrder != null) {
             return failed("您已支付成功，请勿重复支付");
         }
 
         //判断用户是否已存在订单
-        userOrder = orderService.findOrderByStatus(order.getUserId(), 1);
+        userOrder = orderService.findRegOrderByStatus(order.getUserId(), 1);
         if (userOrder != null) {
             return failed(HttpStatus.CONTINUE, "您有待支付的订单");
         }
@@ -195,13 +195,13 @@ public class YqPayController extends BaseController {
         BigDecimal amount = new BigDecimal("0");
         School school = schoolService.get(order.getClassId());
 
-        Order userOrder = orderService.findOrderByStatus(order.getUserId(), 2);
+        Order userOrder = orderService.findRegOrderByStatus(order.getUserId(), 2);
         if (userOrder != null) {
             return failed("您已支付成功，请勿重复支付");
         }
 
         //判断用户是否已存在订单
-        userOrder = orderService.findOrderByStatus(order.getUserId(), 1);
+        userOrder = orderService.findRegOrderByStatus(order.getUserId(), 1);
         if (userOrder == null) {
             return failed("您没有支付中的订单，请勿非法请求");
         }

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

@@ -33,4 +33,7 @@ public interface OrderDao extends BaseDAO<Integer, Order> {
     List<Order> findPayingOrdersOver(Map<String,Object> map);
 
     Integer getPayingOrderNums(int groupId);
+
+    Order findRegOrderByStatus(@Param("userId") Integer userId,@Param("status") Integer status);
+
 }

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

@@ -104,4 +104,7 @@ public interface OrderService extends BaseService<Integer, Order> {
     Integer getPayingOrderNums(int groupId);
 
     Order findOrderByStatus(Integer userId,Integer status);
+
+    Order findRegOrderByStatus(Integer userId, Integer status);
+
 }

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

@@ -213,4 +213,10 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
         return orderDao.findOrderByStatus(userId, status);
     }
 
+    @Override
+    public Order findRegOrderByStatus(Integer userId, Integer status){
+       return  orderDao.findRegOrderByStatus(userId,status);
+    }
+
+
 }

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

@@ -214,4 +214,9 @@
         </foreach>
         <![CDATA[ AND  `status`=1 AND `create_time` <= ]]> #{beforeTime}
     </select>
+
+    <!-- 乐团报名缴费订单 -->
+    <select id="findRegOrderByStatus" resultType="com.ym.mec.collectfee.entity.Order">
+		SELECT * FROM `order` WHERE `user_id` = #{userId} AND `type`=1 AND `status` = #{status}
+	</select>
 </mapper>