--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/constant/school/sysuser/SchoolRequestPath.java

@@ -10,7 +10,10 @@ public class SchoolRequestPath extends BaseRequestPath {
     /** 学生 */
     public static final String STUDENT = "/student";
     
-    
+    /**
+	 * 订单id查询订单是否被支付
+	 */
+	public static final String CHECK_IS_PAID = "/check-is-paid";
     
 
     /** 对账查询 */

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/controller/studentorder/StudentOrderController.java

@@ -119,5 +119,12 @@ public class StudentOrderController {
 		Integer wechatPayType = form.getWechatPayType();
 		return studentOrderService.toPayYee(orderId,payType,wechatPayType);
 	}
+	
+	
+	@ApiOperation("订单id查询订单是否被支付")
+	@GetMapping(SchoolRequestPath.CHECK_IS_PAID)
+	public CallBack<Integer> checkIsPaid(Integer oid){
+		return CallBack.success(studentOrderService.updateCheckIsPaid(oid));
+	}
 
 }

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/studentorder/StudentOrderService.java

@@ -121,5 +121,14 @@ public interface StudentOrderService extends BaseService<StudentOrder,Integer>{
 	 * @data 2019年9月12日 下午3:09:08
 	 */
 	String toPayYee(Integer orderId, Integer payType, Integer wechatPayType);
+	
+	/**
+	 * 查询订单是否被支付
+	 * @param oid
+	 * @return
+	 * @auther zzg
+	 * @data 2019年9月12日 下午4:05:45
+	 */
+	Integer updateCheckIsPaid(Integer oid);
 
 }

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/service/studentorder/StudentOrderServiceImpl.java

@@ -217,5 +217,10 @@ public class StudentOrderServiceImpl extends BaseModelServiceImpl<StudentOrder,I
 		form.setWechatPayType(wechatPayType);		
 		return proxyClient.pay(form);
 	}
+	
+	@Override
+	public Integer updateCheckIsPaid(Integer oid) {
+		return proxyClient.pay_query(oid);
+	}
 
 }

com.zrqx.third/src/main/java/com/zrqx/third/alipay/AliPayController.java

@@ -89,7 +89,7 @@ public class AliPayController {
 		if (min <= 0) {
 			return CallBack.fail("订单超时,请重新下单");
 		}
-		String minStr = min + "m";
+		/*String minStr = min + "m";
 		// minStr = "1h";
 		// String total_amount = "0.01";
 		alipayRequest.setBizContent("{\"out_trade_no\":\"" + alipay.getOut_trade_no() + "\"," + "\"total_amount\":\""
@@ -98,7 +98,7 @@ public class AliPayController {
 				// 订单最晚支付时间为 1h 取值范围：1m～15d 1m～15d。m-分钟，h-小时，d-天，
 				// 1c-当天（1c-当天的情况下，无论交易何时创建，都在0点关闭）。 该参数数值不接受小数点， 如 1.5h，可转换为 90m
 				+ "\"timeout_express\":\"" + minStr + "\","
-				+ "\"product_code\":\"FAST_INSTANT_TRADE_PAY\"}");
+				+ "\"product_code\":\"FAST_INSTANT_TRADE_PAY\"}");*/
 		// 请求
 		String result = "";
 		String url = "https://openapi.alipay.com/gateway.do?";