java/PlayPai.git

			@@ -70,6 +70,12 @@
			@Autowired
			private TBackRecordService backRecordService;

			@Autowired
			private ISiteBookingService iSiteBookingService;

			@Autowired
			private ISiteService siteService;


			/**
			* 获取场地列表
			@@ -155,10 +161,7 @@
			}


			@Autowired
			private ISiteBookingService iSiteBookingService;
			@Autowired
			private ISiteService siteService;


			/**
			* 获取场地预约日期数据
			@@ -327,7 +330,6 @@
			*/
			@Override
			public ResultUtil reservationSite(Integer uid, ReservationSite reservationSite) throws Exception {

			Site site = this.getById(reservationSite.getId());
			AppUser appUser = appUserClient.queryAppUser(uid);
			String[] split = reservationSite.getTimes().split(";");
			@@ -387,7 +389,6 @@
			return ResultUtil.error("优惠券已过期");
			}
			if (userCoupon != null && coupon.getType() == 1) {//满减
			// {"conditionalAmount":50,"deductionAmount":10,"experienceName":""}
			JSONObject jsonObject = JSON.parseObject(coupon.getContent());
			Double num1 = jsonObject.getDouble("conditionalAmount");
			Double num2 = jsonObject.getDouble("deductionAmount");
			@@ -432,7 +433,6 @@
			siteBooking.setState(1);
			siteBooking.setInsertTime(new Date());

			// 2.0
			siteBooking.setNextName(reservationSite.getNextName());
			siteBooking.setIsHalf(reservationSite.getIsHalf());
			siteBooking.setHalfName(reservationSite.getHalfName());
			@@ -449,6 +449,9 @@
			}
			if (reservationSite.getPayType() == 3) {//玩湃币支付
			if (reservationSite.getIsHalf() == 2) {



			return playPaiCoinPaymentSite(appUser, Double.valueOf(site.getPlayPaiCoin()), siteBooking);
			} else {
			return playPaiCoinPaymentSite(appUser, site.getPlayPaiCoinOne(), siteBooking);