From 7a8af8c19b40b8028e25ee0b669463d06f723a30 Mon Sep 17 00:00:00 2001
From: 刘帅 <rr.iii@qq.com>
Date: 星期一, 21 九月 2026 15:57:24 +0800
Subject: [PATCH] bug：测试问题统一修改
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 474 ++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 341 insertions(+), 133 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
index 63b537f..d05d8818ea 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java
@@ -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;
@@ -90,7 +89,14 @@
private ISiteService siteService;
-
+// public static void main(String[] args) {
+// String now = DateUtil.now().substring(11, 19);
+// System.err.println(now);
+// if ("17:00:00".compareTo(now) <= 0 && "19:00:00".compareTo(now) >= 0) {
+// System.err.println("yes");
+// }
+//
+// }
/**
* 获取场地列表
@@ -104,26 +110,33 @@
querySiteList.setPageNum((querySiteList.getPageNum() - 1) * querySiteList.getPageSize());
DayOfWeek dayOfWeek = LocalDate.now().getDayOfWeek();
Map<Integer, List<TSitePrice>> priceMap = sitePriceService.lambdaQuery().eq(TSitePrice::getDayOfWeek, dayOfWeek.getValue())
- .eq(TSitePrice::getTargetAudience,1).list()
+ .eq(querySiteList.getTargetAudience() != null, TSitePrice::getTargetAudience, querySiteList.getTargetAudience())
+ .list()
.stream().collect(Collectors.groupingBy(TSitePrice::getSiteId));
List<QuerySiteListVo> querySiteListVos = this.baseMapper.querySiteList(querySiteList);
+ // 获取当前时间 只需要时分秒 格式hh:mm:ss
+ String now = DateUtil.now().substring(11, 19);
for (QuerySiteListVo querySiteListVo : querySiteListVos) {
querySiteListVo.setPrice(0.0);
+ querySiteListVo.setTimes("");
if (ToolUtil.isEmpty(querySiteList.getLon())) {
querySiteListVo.setDistance(0D);
continue;
}
List<TSitePrice> tSitePrices = priceMap.get(querySiteListVo.getId());
- if (tSitePrices!=null&& !tSitePrices.isEmpty()){
- BigDecimal bigDecimal = tSitePrices.get(0).getCashPrice();
+ if (tSitePrices != null && !tSitePrices.isEmpty()) {
+ BigDecimal bigDecimal = BigDecimal.ZERO;
// 遍历 查询最小的价格
for (TSitePrice tSitePrice : tSitePrices) {
- if (bigDecimal.compareTo(tSitePrice.getCashPrice()) > 0) {
- bigDecimal = tSitePrice.getCashPrice();
+ // 当前时间再范围之内
+ if (tSitePrice.getStartTime().compareTo(now) <= 0 && tSitePrice.getEndTime().compareTo(now) >= 0) {
+ if (tSitePrice.getCashPrice().compareTo(bigDecimal) > 0) {
+ bigDecimal = tSitePrice.getCashPrice();
+ }
}
}
querySiteListVo.setPrice(bigDecimal.doubleValue());
- querySiteListVo.setTimes(tSitePrices.get(0).getStartTime() + "-" + tSitePrices.get(tSitePrices.size()-1).getEndTime());
+ querySiteListVo.setTimes(tSitePrices.get(0).getStartTime() + "-" + tSitePrices.get(tSitePrices.size() - 1).getEndTime());
}
Map<String, Double> distance = GeodesyUtil.getDistance(querySiteList.getLon() + "," + querySiteList.getLat(), querySiteListVo.getStoreLon() + "," + querySiteListVo.getStoreLat());
double wgs84 = new BigDecimal(distance.get("WGS84")).divide(new BigDecimal(1000)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
@@ -282,7 +295,6 @@
querySiteTimes.setSelectCount(0);
querySiteTimes.setSelectMaxCount(site.getWalkinCapacity());
querySiteTimes.setIsReserve(0);
- querySiteTimes.setTimeAfter(0);
querySiteTimes.setCashPrice(tSitePrice.getCashPrice());
querySiteTimes.setCoinPrice(tSitePrice.getCoinPrice());
String temp = tSitePrice.getStartTime().substring(0, tSitePrice.getStartTime().length() - 3) + "-" + tSitePrice.getEndTime().substring(0, tSitePrice.getEndTime().length() - 3);
@@ -315,44 +327,42 @@
count++;
}
}
- if (querySiteTimes.getSelectable() == 1&&end.before(now)){
+ if (querySiteTimes.getSelectable() == 1 && end.before(now)) {
querySiteTimes.setSelectable(0);
- querySiteTimes.setTimeAfter(1);
}
- if (end.before(now)){
+ if (end.before(now)) {
querySiteTimes.setSelectable(0);
- querySiteTimes.setTimeAfter(1);
}
querySiteTimes.setSelectCount(count);
- if (flag == 0 && querySiteTimes.getSelectable() == 1) {
+ if (flag == 0 && querySiteTimes.getSelectable() == 1) {
// 当前时间段还没有预约
Integer walkinCapacity = site.getWalkinCapacity();
// 计算散客预约人数和最大散客容纳数
System.err.println("预约人数" + count);
System.err.println("最大散客容纳数" + walkinCapacity);
if (walkinCapacity <= count) {
- if (targetAudience==1 && walkinCapacity!=0){
+ if (targetAudience == 1 && walkinCapacity != 0) {
// 不可预约
System.err.println("不可预约 也不能散客");
querySiteTimes.setSelectable(0);
querySiteTimes.setIsReserve(0);
- }else if (targetAudience==2){
+ } else if (targetAudience == 2) {
// 不能散客
System.err.println("不可预约 也不能散客");
querySiteTimes.setSelectable(0);
querySiteTimes.setIsReserve(0);
- }else{
+ } else {
querySiteTimes.setSelectable(1);
}
- }else{
- if (targetAudience==2){
+ } else {
+ if (targetAudience == 2) {
// 散客只能预约当前时间段
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
String nowStr = simpleDateFormat.format(now);
// 判断当前时间有没有在timePriceStart和timePriceEnd之间
- if (DateComparisonExample.isStringWithinTimeRange(nowStr, simpleDateFormat.parse(timePriceStart), simpleDateFormat.parse(timePriceEnd))) {
+ if (DateComparisonExample.isStringWithinTimeRange(nowStr, simpleDateFormat.parse(timePriceStart), simpleDateFormat.parse(timePriceEnd))) {
querySiteTimes.setSelectable(1);
- }else{
+ } else {
querySiteTimes.setSelectable(0);
}
}
@@ -448,12 +458,252 @@
}
+
+ // 用于继续支付
+ public List<QuerySiteTimes> querySiteTimes1(Integer siteBookingId, String day, String halfName, String siteName, Integer targetAudience) throws Exception {
+
+ SiteBooking siteBookingServiceById = iSiteBookingService.getById(siteBookingId);
+ Integer id = siteBookingServiceById.getSiteId();
+ System.out.println("=======date======" + day);
+ List<String> strings = new ArrayList<>();
+
+ List<SiteBooking> siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>()
+ .ne("id", siteBookingId).eq("siteId", id).ne("status", 5).eq("nextName", siteName).like("times", day));
+
+ if (siteName == null || siteName.equals("")) {
+ siteBookings = iSiteBookingService.list(new QueryWrapper<SiteBooking>().eq("siteId", id).ne("status", 5).like("times", day));
+ }
+
+
+ System.out.println("=======已预约列表======" + siteBookings);
+ for (SiteBooking siteBooking : siteBookings) {
+
+
+ String[] split = siteBooking.getTimes().split(";");
+
+ if (siteBooking.getIsHalf() == 2) {
+ for (String s : split) {
+ String convertedValue = s.substring(11);
+ strings.add(convertedValue + (siteBooking.getTargetAudience() != null ? "," + siteBooking.getTargetAudience() : ",1"));
+ }
+ } else {
+ if (halfName == null) {
+ for (String s : split) {
+ String convertedValue = s.substring(11);
+ strings.add(convertedValue + (siteBooking.getTargetAudience() != null ? "," + siteBooking.getTargetAudience() : ",1"));
+ }
+ }
+
+ if (siteBooking.getHalfName().equals(halfName)) {
+ for (String s : split) {
+ String convertedValue = s.substring(11);
+ strings.add(convertedValue + (siteBooking.getTargetAudience() != null ? "," + siteBooking.getTargetAudience() : ",1"));
+ }
+
+ }
+ }
+ }
+ System.out.println("======已经预约时间段=======" + strings);
+
+
+ Site site = siteService.getById(id);
+ List<QuerySiteTimes> timeRanges = new ArrayList<>();
+ day = day.split(";")[0].split(" ")[0];
+ LocalDate date = LocalDate.parse(day);
+ DayOfWeek dayOfWeek = date.getDayOfWeek();
+ // 通过日期 确定周X 查询设置的可以约时间段和金额 封装基础时间段数据
+ LambdaQueryWrapper<TSitePrice> tSitePriceLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tSitePriceLambdaQueryWrapper.eq(TSitePrice::getSiteId, id);
+ tSitePriceLambdaQueryWrapper.orderByAsc(TSitePrice::getStartTime);
+ tSitePriceLambdaQueryWrapper.eq(TSitePrice::getTargetAudience, targetAudience);
+ tSitePriceLambdaQueryWrapper.eq(TSitePrice::getDayOfWeek, dayOfWeek.getValue());
+ if (StringUtils.hasLength(halfName)) {
+ tSitePriceLambdaQueryWrapper.eq(TSitePrice::getFieldType, 2);
+ } else {
+ tSitePriceLambdaQueryWrapper.eq(TSitePrice::getFieldType, 1);
+ }
+ List<TSitePrice> sitePrice = sitePriceService.list(tSitePriceLambdaQueryWrapper);
+
+ SimpleDateFormat simpleDateFormat1 = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+ for (TSitePrice tSitePrice : sitePrice) {
+ QuerySiteTimes querySiteTimes = new QuerySiteTimes();
+ querySiteTimes.setTime(tSitePrice.getStartTime().substring(0, tSitePrice.getStartTime().length() - 3) + "-" + tSitePrice.getEndTime().substring(0, tSitePrice.getEndTime().length() - 3));
+ querySiteTimes.setSelectable(1);
+ querySiteTimes.setSelectCount(0);
+ querySiteTimes.setSelectMaxCount(site.getWalkinCapacity());
+ querySiteTimes.setIsReserve(0);
+ querySiteTimes.setCashPrice(tSitePrice.getCashPrice());
+ querySiteTimes.setCoinPrice(tSitePrice.getCoinPrice());
+ String temp = tSitePrice.getStartTime().substring(0, tSitePrice.getStartTime().length() - 3) + "-" + tSitePrice.getEndTime().substring(0, tSitePrice.getEndTime().length() - 3);
+ String timePriceStart = day + " " + tSitePrice.getStartTime().substring(0, tSitePrice.getStartTime().length() - 3);
+ String timePriceEnd = day + " " + tSitePrice.getEndTime().substring(0, tSitePrice.getEndTime().length() - 3);
+ Date now = new Date();
+ Date start = simpleDateFormat1.parse(timePriceStart);
+ Date end = simpleDateFormat1.parse(timePriceEnd);
+ // 已经预约了 判断是散客模式还是订场模式
+ Integer flag = 0;
+ // 散客预约人数
+ Integer count = 0;
+ for (String time : strings) {
+ // 先判断时间是否和预约时间有交集
+ String s = time.split(",")[1];
+ String timeRange = time.split(",")[0];
+ String[] split = timeRange.split("-");
+ String bookingStart = day + " " + split[0];
+ String bookingEnd = day + " " + split[1];
+ if (!isTimePeriodsIntersect(timePriceStart, timePriceEnd, bookingStart, bookingEnd)) {
+ // 不相交
+ } else {
+ if (s.equals("1")) {
+ // 订场 不可再预约了
+ querySiteTimes.setIsReserve(1);
+ querySiteTimes.setSelectable(0);
+ flag = 1;
+ break;
+ }
+ count++;
+ }
+ }
+ if (querySiteTimes.getSelectable() == 1 && end.before(now)) {
+ querySiteTimes.setSelectable(0);
+ }
+ if (end.before(now)) {
+ querySiteTimes.setSelectable(0);
+ }
+ querySiteTimes.setSelectCount(count);
+ if (flag == 0 && querySiteTimes.getSelectable() == 1) {
+ // 当前时间段还没有预约
+ Integer walkinCapacity = site.getWalkinCapacity();
+ // 计算散客预约人数和最大散客容纳数
+ System.err.println("预约人数" + count);
+ System.err.println("最大散客容纳数" + walkinCapacity);
+ if (walkinCapacity <= count) {
+ if (targetAudience == 1 && walkinCapacity != 0) {
+ // 不可预约
+ System.err.println("不可预约 也不能散客");
+ querySiteTimes.setSelectable(0);
+ querySiteTimes.setIsReserve(0);
+ } else if (targetAudience == 2) {
+ // 不能散客
+ System.err.println("不可预约 也不能散客");
+ querySiteTimes.setSelectable(0);
+ querySiteTimes.setIsReserve(0);
+ } else {
+ querySiteTimes.setSelectable(1);
+ }
+ } else {
+ if (targetAudience == 2) {
+ // 散客只能预约当前时间段
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+ String nowStr = simpleDateFormat.format(now);
+ // 判断当前时间有没有在timePriceStart和timePriceEnd之间
+ if (DateComparisonExample.isStringWithinTimeRange(nowStr, simpleDateFormat.parse(timePriceStart), simpleDateFormat.parse(timePriceEnd))) {
+ querySiteTimes.setSelectable(1);
+ } else {
+ querySiteTimes.setSelectable(0);
+ }
+ }
+ }
+ }
+ // 查出lock
+ List<SiteLock> list = siteLockService.list(new LambdaQueryWrapper<SiteLock>().eq(SiteLock::getSiteId, id));
+ for (SiteLock siteLock : list) {
+ String stime = day + " " + tSitePrice.getStartTime().substring(0, tSitePrice.getStartTime().length() - 3);
+ String etime = day + " " + tSitePrice.getEndTime().substring(0, tSitePrice.getEndTime().length() - 3);
+ boolean stringDateBetween = DateComparisonExample.isStringDateBetween(stime + " - " + etime, siteLock.getStartTime(), siteLock.getEndTime());
+ if (stringDateBetween) {
+ System.err.println("11111预约开始" + stime + "预约结束" + etime);
+ querySiteTimes.setSelectable(0);
+ querySiteTimes.setIsReserve(1);
+ }
+ if (DateComparisonExample.isStringWithinTimeRange(stime, siteLock.getStartTime(), siteLock.getEndTime())) {
+ System.err.println("22222预约开始" + stime + "预约结束" + etime);
+
+ querySiteTimes.setSelectable(0);
+ querySiteTimes.setIsReserve(1);
+ }
+ if (DateComparisonExample.isStringWithinTimeRange(etime, siteLock.getStartTime(), siteLock.getEndTime())) {
+ System.err.println("33333预约开始" + stime + "预约结束" + etime);
+
+ querySiteTimes.setSelectable(0);
+ querySiteTimes.setIsReserve(1);
+ }
+ }
+ timeRanges.add(querySiteTimes);
+ }
+ System.out.println("封装后的基础时间段和价格" + site);
+
+// System.out.println("================" + site);
+// String appointmentStartTime = site.getAppointmentStartTime();
+// String appointmentEndTime = site.getAppointmentEndTime();
+//
+// String currentTime = appointmentStartTime;
+// while (currentTime.compareTo(appointmentEndTime) < 0) {
+// String nextTime = null;
+// if ("智慧场地".equals(site.getTypeName())) {
+// nextTime = getNextTimeOne(currentTime);
+// } else {
+// nextTime = getNextTime(currentTime);
+// }
+//
+//
+// String timeRange = currentTime + "-" + nextTime;
+// QuerySiteTimes orderDto = new QuerySiteTimes();
+// orderDto.setTime(timeRange);
+//
+// LocalTime currentTime1 = LocalTime.now();
+// LocalTime targetTime = LocalTime.parse(currentTime);
+//
+// boolean hasExceeded = currentTime1.isAfter(targetTime);
+//// if (hasExceeded){
+//// orderDto.setSelectable(0);
+//// }
+// if (strings.contains(timeRange)) {
+//
+// orderDto.setSelectable(0);
+// } else {
+//
+// String stime = day + " " + currentTime;
+// String etime = day + " " + nextTime;
+// orderDto.setSelectable(1);
+// // 查出lock
+// List<SiteLock> list = siteLockService.list(new LambdaQueryWrapper<SiteLock>().eq(SiteLock::getSiteId, id));
+// for (SiteLock siteLock : list) {
+// boolean stringDateBetween = DateComparisonExample.isStringDateBetween(stime + " - " + etime, siteLock.getStartTime(), siteLock.getEndTime());
+// if (stringDateBetween) {
+// orderDto.setSelectable(0);
+// }
+// if (DateComparisonExample.isStringWithinTimeRange(stime, siteLock.getStartTime(), siteLock.getEndTime())) {
+// orderDto.setSelectable(0);
+// }
+// if (DateComparisonExample.isStringWithinTimeRange(etime, siteLock.getStartTime(), siteLock.getEndTime())) {
+// orderDto.setSelectable(0);
+// }
+//
+// }
+//
+//
+// }
+//
+//
+// timeRanges.add(orderDto);
+// currentTime = nextTime;
+// }
+ System.out.println("----最后封装的时间段数据------" + timeRanges);
+
+ return timeRanges;
+
+
+ }
+
/**
* 判断两个时间段是否有交集
+ *
* @param start1 第一个时间段开始时间
- * @param end1 第一个时间段结束时间
+ * @param end1 第一个时间段结束时间
* @param start2 第二个时间段开始时间
- * @param end2 第二个时间段结束时间
+ * @param end2 第二个时间段结束时间
* @return 如果有交集返回true，否则返回false
*/
private boolean isTimePeriodsIntersect(String start1, String end1, String start2, String end2) {
@@ -528,7 +778,7 @@
String[] split = reservationSite.getTimes().split(";");
// 所选时间段 所需总计金额
BigDecimal money = BigDecimal.ZERO;
- BigDecimal playCoin = BigDecimal.ZERO;
+ Integer playCoin = 0;
for (String s : split) {
String day = s.split(" ")[0];
String time = s.split(" ")[1];
@@ -551,7 +801,7 @@
}
if (querySiteTime.getTime().equals(time)) {
money = money.add(querySiteTime.getCashPrice());
- playCoin = playCoin.add(querySiteTime.getCoinPrice());
+ playCoin = playCoin + querySiteTime.getCoinPrice();
break;
}
}
@@ -577,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();
@@ -593,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);
@@ -624,20 +874,33 @@
siteBooking.setBooker(reservationSite.getBooker());
siteBooking.setPhone(reservationSite.getPhone());
siteBooking.setPayType(reservationSite.getPayType());
- siteBooking.setPayMoney(money.setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ if (reservationSite.getPayType() == 3) {
+ siteBooking.setPayMoney(playCoin.doubleValue());
+ } else {
+ siteBooking.setPayMoney(money.setScale(2, RoundingMode.HALF_EVEN).doubleValue());
+ }
siteBooking.setUserCouponId(reservationSite.getCouponId());
siteBooking.setStatus(0);
siteBooking.setState(1);
siteBooking.setTargetAudience(reservationSite.getTargetAudience());
siteBooking.setInsertTime(new Date());
- siteBooking.setMoney(money+","+playCoin);
+ siteBooking.setMoney(money + "," + playCoin);
siteBooking.setNextName(reservationSite.getNextName());
siteBooking.setIsHalf(reservationSite.getIsHalf());
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;
}
@@ -645,9 +908,9 @@
return aliPaymentSite(money.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), siteBooking);
}
if (reservationSite.getPayType() == 3) {//玩湃币支付
- return playPaiCoinPaymentSite(appUser, playCoin.setScale(2, RoundingMode.HALF_EVEN).doubleValue(), siteBooking);
-
+ return playPaiCoinPaymentSite(appUser, playCoin.doubleValue(), siteBooking);
}
+
return ResultUtil.success();
}
@@ -715,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;
}
@@ -834,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);
+ }
}
@@ -855,11 +1081,14 @@
pageNo = (pageNo - 1) * pageSize;
List<QueryMySiteVo> queryMySiteVos = this.baseMapper.queryMySite(uid, status, pageNo, pageSize);
for (QueryMySiteVo queryMySiteVo : queryMySiteVos) {
+ if (queryMySiteVo.getTargetAudience() == null) {
+ queryMySiteVo.setTargetAudience(1);
+ }
SiteBooking siteBooking = siteBookingService.getById(queryMySiteVo.getId());
String[] split = siteBooking.getTimes().split(";");
// 所选时间段 所需总计金额
BigDecimal money = BigDecimal.ZERO;
- BigDecimal playCoin = BigDecimal.ZERO;
+ Integer playCoin = 0;
for (String s : split) {
String day = s.split(" ")[0];
@@ -883,12 +1112,12 @@
// }
if (querySiteTime.getTime().equals(time)) {
money = money.add(querySiteTime.getCashPrice());
- playCoin = playCoin.add(querySiteTime.getCoinPrice());
+ playCoin = playCoin + querySiteTime.getCoinPrice();
break;
}
}
}
- queryMySiteVo.setPlayPaiCoin(playCoin.setScale(0, RoundingMode.DOWN).intValue());
+ queryMySiteVo.setPlayPaiCoin(playCoin);
}
return queryMySiteVos;
}
@@ -907,10 +1136,15 @@
Site byId = siteService.getById(siteBooking.getSiteId());
SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
Date startTime = siteBooking.getStartTime();
- if (format.format(new Date()).equals(format.format(startTime)) && siteBooking.getStatus() != 0) {
+ if (siteBooking.getTargetAudience() == 1 && format.format(new Date()).equals(format.format(startTime)) && siteBooking.getStatus() != 0) {
return ResultUtil.error("预约当天，不能取消");
}
-
+ if (siteBooking.getTargetAudience() == 2) {
+ Date date = new Date();
+ if (siteBooking.getEndTime().before(date)) {
+ return ResultUtil.error("已过期，不能取消");
+ }
+ }
if (siteBooking.getStatus() == 0) {
siteBooking.setStatus(5);
siteBookingService.updateById(siteBooking);
@@ -1030,30 +1264,19 @@
String[] split = siteBooking.getTimes().split(";");
// 所选时间段 所需总计金额
BigDecimal money = BigDecimal.ZERO;
- BigDecimal playCoin = BigDecimal.ZERO;
+ Integer playCoin = 0;
for (String s : split) {
String day = s.split(" ")[0];
String time = s.split(" ")[1];
String bookingStart = day + " " + time.split("-")[0];
String bookingEnd = day + " " + time.split("-")[1];
- List<QuerySiteTimes> querySiteTimes = querySiteTimes(siteBooking.getId(), day, siteBooking.getHalfName(), siteBooking.getNextName(), siteBooking.getTargetAudience());
+ List<QuerySiteTimes> querySiteTimes = querySiteTimes1(siteBooking.getId(), day, siteBooking.getHalfName(), siteBooking.getNextName(), siteBooking.getTargetAudience());
for (QuerySiteTimes querySiteTime : querySiteTimes) {
String timePriceStart = day + " " + querySiteTime.getTime().split("-")[0];
String timePriceEnd = day + " " + querySiteTime.getTime().split("-")[1];
- if (!isTimePeriodsIntersect(timePriceStart, timePriceEnd, bookingStart, bookingEnd)) {
- // 时间不相交
- } else if (querySiteTime.getSelectable() == 0) {
- if (querySiteTime.getIsReserve() == 1) {
- return ResultUtil.error("【" + s + "】" +
- "时间段已被使用");
- } else {
- return ResultUtil.error("【" + s + "】" +
- "时间段散客人数已满");
- }
- }
if (querySiteTime.getTime().equals(time)) {
money = money.add(querySiteTime.getCashPrice());
- playCoin = playCoin.add(querySiteTime.getCoinPrice());
+ playCoin = playCoin + querySiteTime.getCoinPrice();
break;
}
}
@@ -1074,23 +1297,19 @@
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));
+
siteBooking.setPayType(payType);
- siteBooking.setPayMoney(money.doubleValue());
if (payType == 3) {
- siteBooking.setUserCouponId(null);
+ siteBooking.setPayMoney(playCoin.doubleValue());
+ } else {
+ siteBooking.setPayMoney(money.doubleValue());
}
siteBookingService.updateById(siteBooking);
if (payType == 1) {//微信支付
@@ -1124,30 +1343,19 @@
Map<String, Double> map = new HashMap<>();
// 所选时间段 所需总计金额
BigDecimal money = BigDecimal.ZERO;
- BigDecimal playCoin = BigDecimal.ZERO;
+ Integer playCoin = 0;
for (String s : split) {
String day = s.split(" ")[0];
String time = s.split(" ")[1];
String bookingStart = day + " " + time.split("-")[0];
String bookingEnd = day + " " + time.split("-")[1];
- List<QuerySiteTimes> querySiteTimes = querySiteTimes(siteBooking.getId(), day, siteBooking.getHalfName(), siteBooking.getNextName(), siteBooking.getTargetAudience());
+ List<QuerySiteTimes> querySiteTimes = querySiteTimes1(siteBooking.getId(), day, siteBooking.getHalfName(), siteBooking.getNextName(), siteBooking.getTargetAudience());
for (QuerySiteTimes querySiteTime : querySiteTimes) {
String timePriceStart = day + " " + querySiteTime.getTime().split("-")[0];
String timePriceEnd = day + " " + querySiteTime.getTime().split("-")[1];
- if (!isTimePeriodsIntersect(timePriceStart, timePriceEnd, bookingStart, bookingEnd)) {
- // 时间不相交
- } else if (querySiteTime.getSelectable() == 0) {
- if (querySiteTime.getIsReserve() == 1) {
- return ResultUtil.error("【" + s + "】" +
- "时间段已被使用");
- } else {
- return ResultUtil.error("【" + s + "】" +
- "时间段散客人数已满");
- }
- }
if (querySiteTime.getTime().equals(time)) {
money = money.add(querySiteTime.getCashPrice());
- playCoin = playCoin.add(querySiteTime.getCoinPrice());
+ playCoin = playCoin + querySiteTime.getCoinPrice();
break;
}
}
@@ -1168,10 +1376,10 @@
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()){
+ switch (siteBooking.getPayType()) {
case 1:
map.put("cash", money.doubleValue());
break;
--
Gitblit v1.7.1