java/PlayPai.git

			@@ -9,7 +9,6 @@
			import com.alipay.api.DefaultAlipayClient;
			import com.alipay.api.request.AlipayTradeOrderSettleRequest;
			import com.alipay.api.response.AlipayTradeOrderSettleResponse;
			import com.alipay.api.response.AlipayTradeQueryResponse;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			@@ -828,8 +827,8 @@
			if (couponId != null && couponId != 0) {
			if (null != couponId && reservationSite.getPayType() != 3) {
			UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(reservationSite.getCouponId(), uid));
			if (userCoupon != null && userCoupon.getStatus() == 2) {
			return ResultUtil.error("优惠券已被核销");
			if (userCoupon == null \|\| userCoupon.getStatus() == null \|\| userCoupon.getStatus() != 1) {
			return ResultUtil.error("优惠券不可用");
			}
			Coupon coupon = couponClient.queryCouponById(userCoupon.getCouponId());
			long time = coupon.getEndTime().getTime();
			@@ -844,15 +843,15 @@
			return ResultUtil.error("该优惠券无法使用");
			}

			money = money.subtract(new BigDecimal(num2)).setScale(2, RoundingMode.HALF_EVEN);
			money = money.subtract(new BigDecimal(num2)).max(BigDecimal.ZERO).setScale(2, RoundingMode.HALF_EVEN);
			}
			if (userCoupon != null && coupon.getType() == 2) {//代金券
			JSONObject jsonObject = JSON.parseObject(coupon.getContent());
			Double num1 = jsonObject.getDouble("conditionalAmount");
			if (money.compareTo(new BigDecimal(num1)) <= 0) {
			if (num1 == null \|\| num1 <= 0) {
			return ResultUtil.error("该优惠券无法使用");
			}
			money = money.subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN);
			money = money.subtract(new BigDecimal(num1)).max(BigDecimal.ZERO).setScale(2, RoundingMode.HALF_EVEN);
			}
			userCoupon.setStatus(2);
			userCouponClient.updateUserCoupon(userCoupon);
			@@ -891,8 +890,17 @@
			siteBooking.setHalfName(reservationSite.getHalfName());
			siteBookingService.save(siteBooking);


			if (reservationSite.getPayType() == 1) {//微信支付
			if (money.compareTo(BigDecimal.ZERO)==0){
			siteBooking.setStatus(1);
			siteBooking.setPayMoney(BigDecimal.ZERO.doubleValue());
			siteBooking.setPayTime(new Date());
			siteBookingService.updateById(siteBooking);
			consumeCouponAfterSuccessfulPayment(siteBooking);
			HashMap<String, String> map = new HashMap<>();
			map.put("siteBooking", siteBooking.getId().toString());
			return ResultUtil.success(map);
			}
			if (reservationSite.getPayType() == 1 ) {//微信支付
			ResultUtil resultUtil = weChatPaymentSite(money.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), siteBooking);
			return resultUtil;
			}
			@@ -901,8 +909,8 @@
			}
			if (reservationSite.getPayType() == 3) {//玩湃币支付
			return playPaiCoinPaymentSite(appUser, playCoin.doubleValue(), siteBooking);

			}

			return ResultUtil.success();
			}

			@@ -970,59 +978,6 @@
			}
			ResultUtil alipay = payMoneyUtil.alipay(smid1, "预约场地", "预约场地", id.toString(), code, paymentPrice.toString(), "/base/site/aliPaymentSiteCallback");
			System.out.println("预约场地----" + alipay.getCode());
			if (alipay.getCode() == 200) {
			String finalSmid = smid1;
			new Thread(new Runnable() {
			@Override
			public void run() {
			try {
			int num = 1;
			int wait = 0;
			while (num <= 10) {
			int min = 5000;
			wait += (min * num);
			Thread.sleep(wait);
			SiteBooking siteBooking = siteBookingService.getById(id);
			if (siteBooking.getStatus() != 0) {
			break;
			}
			AlipayTradeQueryResponse resultUtil = payMoneyUtil.queryALIOrder(code);
			if (resultUtil.getCode().equals("10000") && siteBooking.getStatus() == 0) {
			/**
			* WAIT_BUYER_PAY（交易创建，等待买家付款）、
			* TRADE_CLOSED（未付款交易超时关闭，或支付完成后全额退款）、
			* TRADE_SUCCESS（交易支付成功）、
			* TRADE_FINISHED（交易结束，不可退款）
			*/
			// Map<String, String> data1 = resultUtil.getData();
			// String s = data1.get("tradeStatus");
			String tradeNo = resultUtil.getTradeNo();
			String s = resultUtil.getTradeStatus();
			System.out.println("ssssss" + s);
			if ("TRADE_CLOSED".equals(s) \|\| "TRADE_FINISHED".equals(s) \|\| num == 10) {
			break;
			}
			if ("TRADE_SUCCESS".equals(s)) {
			siteBooking.setPayTime(new Date());
			siteBooking.setStatus(1);
			siteBooking.setPayOrderNo(tradeNo);
			siteBookingService.updateById(siteBooking);
			System.err.println("======完成支付");
			Thread.sleep(30000);
			payMoneyUtil.confirm(finalSmid, code, tradeNo, paymentPrice.toString());
			break;
			}
			if ("WAIT_BUYER_PAY".equals(s)) {
			num++;
			}
			}
			}
			} catch (Exception e) {
			e.printStackTrace();
			}
			}
			}).start();
			}
			return alipay;
			}

			@@ -1089,9 +1044,25 @@
			siteBooking.setPayTime(new Date());
			siteBooking.setStatus(1);
			siteBookingService.updateById(siteBooking);
			consumeCouponAfterSuccessfulPayment(siteBooking);
			HashMap<String, String> map = new HashMap<>();
			map.put("siteBooking", siteBooking.getId().toString());
			return ResultUtil.success(map);
			}

			/**
			* 场地订单实际支付成功后才核销所选优惠券；避免仅创建待支付订单就提前消耗优惠券。
			*/
			private void consumeCouponAfterSuccessfulPayment(SiteBooking siteBooking) {
			if (siteBooking.getUserCouponId() == null \|\| siteBooking.getUserCouponId() == 0) {
			return;
			}
			UserCoupon userCoupon = userCouponClient.queryUserCouponById(
			new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(), siteBooking.getAppUserId()));
			if (userCoupon != null && Integer.valueOf(1).equals(userCoupon.getStatus())) {
			userCoupon.setStatus(2);
			userCouponClient.updateUserCoupon(userCoupon);
			}
			}


			@@ -1326,17 +1297,11 @@
			if (coupon.getType() == 2) {//代金券
			JSONObject jsonObject = JSON.parseObject(coupon.getContent());
			Double num1 = jsonObject.getDouble("conditionalAmount");
			money = money.subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN);
			money = money.subtract(new BigDecimal(num1)).max(BigDecimal.ZERO).setScale(2, RoundingMode.HALF_EVEN);
			}
			userCoupon.setStatus(2);
			userCouponClient.updateUserCoupon(userCoupon);
			}
			if (null != couponId && payType == 3) {
			UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(), appUser.getId()));
			userCoupon.setStatus(1);
			userCouponClient.updateUserCoupon(userCoupon);
			}

			SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
			siteBooking.setOrderNo(sdf.format(new Date()) + UUIDUtil.getNumberRandom(3));

			@@ -1345,9 +1310,6 @@
			siteBooking.setPayMoney(playCoin.doubleValue());
			} else {
			siteBooking.setPayMoney(money.doubleValue());
			}
			if (payType == 3) {
			siteBooking.setUserCouponId(null);
			}
			siteBookingService.updateById(siteBooking);
			if (payType == 1) {//微信支付
			@@ -1414,7 +1376,7 @@
			if (coupon.getType() == 2) {//代金券
			JSONObject jsonObject = JSON.parseObject(coupon.getContent());
			Double num1 = jsonObject.getDouble("conditionalAmount");
			money = money.subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN);
			money = money.subtract(new BigDecimal(num1)).max(BigDecimal.ZERO).setScale(2, RoundingMode.HALF_EVEN);
			}
			}
			switch (siteBooking.getPayType()) {