java/PlayPai.git

			@@ -1023,24 +1023,29 @@
			String code = sdf.format(new Date()) + UUIDUtil.getNumberRandom(5);
			//生成支付订单
			CoursePackageOrder coursePackageOrder = new CoursePackageOrder();
			coursePackageOrder.setCode(code);
			coursePackageOrder.setAppUserId(uid);
			coursePackageOrder.setStudentIds(paymentCourseVo.getStudentIds());
			coursePackageOrder.setCoursePackageId(paymentCourseVo.getId());
			coursePackageOrder.setPayType(paymentCourseVo.getPayType());
			coursePackageOrder.setClassHours(coursePackagePaymentConfig.getClassHours());
			coursePackageOrder.setOriginalPrice(paymentCourseVo.getPrice());
			coursePackageOrder.setUserCouponId(paymentCourseVo.getCouponId());
			coursePackageOrder.setCashPayment(new BigDecimal(paymentPrice));
			coursePackageOrder.setPayUserType(1);
			coursePackageOrder.setPayStatus(1);
			coursePackageOrder.setPayUserId(uid);
			coursePackageOrder.setState(1);
			coursePackageOrder.setInsertTime(new Date());
			coursePackageOrderService.save(coursePackageOrder);
			if (paymentCourseVo.getOrderId()==null) {
			coursePackageOrder.setCode(code);
			coursePackageOrder.setAppUserId(uid);
			coursePackageOrder.setStudentIds(paymentCourseVo.getStudentIds());
			coursePackageOrder.setCoursePackageId(paymentCourseVo.getId());
			coursePackageOrder.setPayType(paymentCourseVo.getPayType());
			coursePackageOrder.setClassHours(coursePackagePaymentConfig.getClassHours());
			coursePackageOrder.setOriginalPrice(paymentCourseVo.getPrice());
			coursePackageOrder.setUserCouponId(paymentCourseVo.getCouponId());
			coursePackageOrder.setCashPayment(new BigDecimal(paymentPrice));
			coursePackageOrder.setPayUserType(1);
			coursePackageOrder.setPayStatus(1);
			coursePackageOrder.setPayUserId(uid);
			coursePackageOrder.setState(1);
			coursePackageOrder.setInsertTime(new Date());
			coursePackageOrderService.save(coursePackageOrder);
			}else {
			code = coursePackageOrderService.getById(paymentCourseVo.getOrderId()).getCode();
			}

			ResultUtil alipay = payMoneyUtil.alipay("购买课程", "购买课程", coursePackagePaymentConfig.getId().toString(), code, paymentPrice.toString(), "/base/course/aliPaymentCourseCallback");
			if (alipay.getCode() == 200) {
			String finalCode = code;
			new Thread(new Runnable() {
			@Override
			public void run() {
			@@ -1054,11 +1059,11 @@
			wait += (min * num);
			Thread.sleep(wait);
			CoursePackageOrder coursePackageOrder1 = coursePackageOrderService.getOne(new QueryWrapper<CoursePackageOrder>()
			.eq("code", code).eq("state", 1));
			.eq("code", finalCode).eq("state", 1));
			if (coursePackageOrder1.getPayStatus() == 2) {
			break;
			}
			AlipayTradeQueryResponse alipayTradeQueryResponse = payMoneyUtil.queryALIOrder(code);
			AlipayTradeQueryResponse alipayTradeQueryResponse = payMoneyUtil.queryALIOrder(finalCode);
			if (null != alipayTradeQueryResponse) {
			/**
			* WAIT_BUYER_PAY（交易创建，等待买家付款）、
			@@ -1242,6 +1247,7 @@
			coursePackageOrderStudent.setTotalClassHours(coursePackageOrderStudent.getTotalClassHours() + coursePackagePaymentConfig.getClassHours());
			coursePackageOrderStudent.setLaveClassHours(coursePackageOrderStudent.getLaveClassHours() + coursePackagePaymentConfig.getClassHours());
			coursePackageOrderStudent.setStatus(1);
			coursePackageOrderStudent.setInsertTime(new Date());
			Integer validDays = coursePackage.getValidDays();
			Calendar calendar = Calendar.getInstance();
			calendar.setTime(useTime.compareTo(new Date()) < 0 ? new Date() : useTime);
			@@ -1716,9 +1722,8 @@
			@Override
			public Integer addCoursePackage(TCoursePackage coursePackage) {
			try {

			coursePackage.setInsertTime(new Date());
			this.baseMapper.insert(coursePackage);

			if (coursePackage.getClassStartTime() != null && coursePackage.getClassStartTime() != "") {
			//生成排课数据
			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");