--no commit message

com.zrqx.core/src/main/java/com/zrqx/core/form/school/sysuser/fg/order/QueryOrderForm.java

@@ -28,6 +28,9 @@ public class QueryOrderForm {
 	private String opsType;
 	@ApiModelProperty("订单种类 0：分担订单，1:快速入口订单 , 2 补订订单  3:退订订单 , 4培训教材订购订单  ")
 	private String variety;
+	@ApiModelProperty("学级")
+	private Integer academicLevel;
+	
 	
 	
 

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/manage/studentorder/StudentOrderManageImpl.java

@@ -115,7 +115,6 @@ public class StudentOrderManageImpl extends BaseManageImpl<StudentOrder,Integer>
 		o.setPayType(payType);//支付类型
 		o.setPayTime(new Date());
 		o.setPayStatus(StudentOrderStatusEnum.HAVE_PAID.getCode());
-		o.setPayTime(new Date());
 		o.setPayCode(trade_no);
 		studentOrderMapper.updateByPrimaryKeySelective(o);
 		return 1;

com.zrqx.school.sysuser/src/main/java/com/zrqx/school/sysuser/mapper/order/FgOrderMapper.java

@@ -27,12 +27,14 @@ public interface FgOrderMapper extends BaseMapper<Order>{
 		    + " eq(o.supplierId,form.supplierId) "
 		    + " eq(o.relationId,form.relationId) "  
 		    + " eq(o.type,form.type) "
+		    + " eq(oi.academicLevel,form.academicLevel) "
 		    + " eq(o.variety,form.variety) "
 		    + " eq(s.type,form.orderType) ";
 		 
 	
 	
-	String DEFAULT_PARAM = " SELECT o.*,s.status,o.opsType from school_order o LEFT JOIN school_order_status s ON o.id = s.orderId ";
+	String DEFAULT_PARAM = " SELECT o.*,s.status,o.opsType from school_order o LEFT JOIN school_order_status s ON o.id = s.orderId "
+			+ "left join school_order_info oi on o.id = oi.orderId ";
 	
 	
 	String DEFAULT_ORDER_SQL = " eq(soi.academicLevel,form.academicLevel) "

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

@@ -83,12 +83,12 @@ public class AliPayController {
 			throw new BaseException("获取订单信息失败");
 		}
 		// TODO 计算订单的超时时间
-		Date start = vo.getCreateTime();
+		/*Date start = vo.getCreateTime();
 		Date end = DateUtils.addDateHour(start, 1);
 		long min = DateUtils.minutesFromNow(end);
 		if (min <= 0) {
 			return CallBack.fail("订单超时,请重新下单");
-		}
+		}*/
 		/*String minStr = min + "m";
 		// minStr = "1h";
 		// String total_amount = "0.01";