增加活动接口

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

@@ -723,4 +723,20 @@ public class YqPayController extends BaseController {
         Map rqMap = orderService.getPayMap(routingAccount, order, null); //获取支付map
         return succeed(rqMap);
     }
+
+    @RequestMapping("/getOrderStatus")
+    public Object getOrderStatus(String orderNo) throws Exception {
+        Order order = orderService.getOrderByOrderNo(orderNo);
+        if(order == null){
+            return failed("订单信息不存在");
+        }
+        if(order.getStatus().equals(2)){
+            return succeed("SUCCESS");
+        }
+        if(order.getStatus().equals(1)){
+            return succeed("ING");
+        }
+        return succeed("FAIL");
+    }
+
 }

src/main/java/com/ym/mec/collectfee/entity/Order.java

@@ -76,7 +76,7 @@ public class Order {
 //	@ApiModelProperty(name = "classId", value = "小课编号")
 	private Integer classId;
 
-	/** 支付状态，0成功，1支付中，2失败 */
+	/** 支付状态，0失败，1支付中，2成功 */
 //	@ApiModelProperty(name = "status", value = "支付状态",hidden = true)
 	private Integer status;
 

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

@@ -151,6 +151,9 @@ public class OrderServiceImpl extends BaseServiceImpl<Integer, Order> implements
         if (school != null) {
             returnUrl = this.returnHost + "/#/login?schoolId=" + school.getSchoolId() + "&cityId=" + school.getCityId();//支付后返回页面
         }
+        if(order.getPromotionType().equals(1)){
+            returnUrl = this.returnHost+ "/#/paymentResult";
+        }
         String payUrl = "https://qyfapi.95epay.com/api/api/hPay/toPayHtml";//支付跳转页
         String payChannels = "{\"weChatPay\":true,\"weChatPayMobile\":false,\"aliPay\":true,\"fastpayXy\":true,\"aliPayMobile\":false,\"balancePay\":false}";//支付方式配置