Merge branch 'master' of http://git.dayaedu.com/yonge/collect_fee

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

@@ -85,7 +85,7 @@ public class YqPayController extends BaseController {
         //判断用户是否已存在订单
         userOrder = orderService.findOrderByStatus(order.getUserId(), 1);
         if (userOrder != null) {
-            return failed(HttpStatus.CONTINUE, "您有待支付的订单，否重新支付");
+            return failed(HttpStatus.CONTINUE, "您有待支付的订单");
         }
 
         //1、判断已报名人数
@@ -189,6 +189,8 @@ public class YqPayController extends BaseController {
      * @return
      * @throws Exception
      */
+    @PostMapping("/rePay")
+    @Transactional(rollbackFor = Exception.class)
     public Object rePay(@ModelAttribute @Validated Order order) throws Exception {
         BigDecimal amount = new BigDecimal("0");
         School school = schoolService.get(order.getClassId());