From faaf4ce0e117cd3f841fd06003e3dfdb2d0f7ebb Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期三, 05 十一月 2025 15:13:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 299 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 226 insertions(+), 73 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 91c4c53..63b537f 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
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.api.config.filter.IFilterConfig;
import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.request.AlipayTradeOrderSettleRequest;
@@ -89,6 +90,8 @@
private ISiteService siteService;
+
+
/**
* 获取场地列表
*
@@ -99,11 +102,28 @@
@Override
public List<QuerySiteListVo> querySiteList(QuerySiteList querySiteList) throws Exception {
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()
+ .stream().collect(Collectors.groupingBy(TSitePrice::getSiteId));
List<QuerySiteListVo> querySiteListVos = this.baseMapper.querySiteList(querySiteList);
for (QuerySiteListVo querySiteListVo : querySiteListVos) {
+ querySiteListVo.setPrice(0.0);
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();
+ // 遍历 查询最小的价格
+ for (TSitePrice tSitePrice : tSitePrices) {
+ if (bigDecimal.compareTo(tSitePrice.getCashPrice()) > 0) {
+ bigDecimal = tSitePrice.getCashPrice();
+ }
+ }
+ querySiteListVo.setPrice(bigDecimal.doubleValue());
+ 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();
@@ -126,6 +146,16 @@
SiteType siteType = siteTypeService.getById(site.getSiteTypeId());
Store store = storeService.getById(site.getStoreId());
QuerySiteInfoVo querySiteInfoVo = new QuerySiteInfoVo();
+ if (site.getTargetAudience().contains("1")) {
+ querySiteInfoVo.setTargetAudience(1);
+ }
+ if (site.getTargetAudience().contains("2")) {
+ querySiteInfoVo.setTargetAudience(2);
+ }
+ if (site.getTargetAudience().contains("1") && site.getTargetAudience().contains("2")) {
+ querySiteInfoVo.setTargetAudience(3);
+ }
+
querySiteInfoVo.setId(site.getId());
querySiteInfoVo.setTypeName(site.getTypeName());
querySiteInfoVo.setName(site.getName());
@@ -227,12 +257,14 @@
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);
@@ -241,24 +273,38 @@
}
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() + "-" + tSitePrice.getEndTime());
+ 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(1);
+ querySiteTimes.setIsReserve(0);
+ querySiteTimes.setTimeAfter(0);
querySiteTimes.setCashPrice(tSitePrice.getCashPrice());
querySiteTimes.setCoinPrice(tSitePrice.getCoinPrice());
- String temp = tSitePrice.getStartTime() + "-" + tSitePrice.getEndTime();
- List<String> booking = strings.stream().filter(e -> e.split(",")[0].equals(temp)).collect(Collectors.toList());
- if (!booking.isEmpty()) {
- // 已经预约了 判断是散客模式还是订场模式
- Integer flag = 0;
- // 散客预约人数
- Integer count = 0;
- for (String time : booking) {
- String s = time.split(",")[1];
+ 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);
@@ -268,26 +314,55 @@
}
count++;
}
- querySiteTimes.setSelectCount(count);
- if (flag == 0) {
- // 当前时间段还没有预约
- Integer walkinCapacity = site.getWalkinCapacity();
- // 计算散客预约人数和最大散客容纳数
- System.err.println("预约人数" + count);
- System.err.println("最大散客容纳数" + walkinCapacity);
- if (walkinCapacity <= count) {
- // 不可预约 也不能散客
+ }
+ if (querySiteTimes.getSelectable() == 1&&end.before(now)){
+ querySiteTimes.setSelectable(0);
+ querySiteTimes.setTimeAfter(1);
+ }
+ if (end.before(now)){
+ querySiteTimes.setSelectable(0);
+ querySiteTimes.setTimeAfter(1);
+ }
+ 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();
- String etime = day + " " + tSitePrice.getEndTime();
+ 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);
@@ -373,7 +448,24 @@
}
+ /**
+ * 判断两个时间段是否有交集
+ * @param start1 第一个时间段开始时间
+ * @param end1 第一个时间段结束时间
+ * @param start2 第二个时间段开始时间
+ * @param end2 第二个时间段结束时间
+ * @return 如果有交集返回true，否则返回false
+ */
+ private boolean isTimePeriodsIntersect(String start1, String end1, String start2, String end2) {
+ // 首先判断是否有任何形式的重叠（包括端点）
+ boolean hasOverlap = start1.compareTo(end2) <= 0 && end1.compareTo(start2) >= 0;
+ // 判断是否仅仅是端点相接
+ boolean onlyTouching = start1.compareTo(end2) == 0 || end1.compareTo(start2) == 0;
+
+ // 有重叠且不是仅仅端点相接才算真正的交集
+ return hasOverlap && !onlyTouching;
+ }
// public static void main(String[] args) {
// String temp = "09:00-09:30";
// List<String> strings = new ArrayList<>();
@@ -440,9 +532,15 @@
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(reservationSite.getId(), day, reservationSite.getHalfName(), reservationSite.getNextName(), reservationSite.getTargetAudience());
for (QuerySiteTimes querySiteTime : querySiteTimes) {
- if (querySiteTime.getTime().equals(time) && querySiteTime.getSelectable() == 0) {
+ 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 + "】" +
"时间段已被使用");
@@ -532,7 +630,7 @@
siteBooking.setState(1);
siteBooking.setTargetAudience(reservationSite.getTargetAudience());
siteBooking.setInsertTime(new Date());
-
+ siteBooking.setMoney(money+","+playCoin);
siteBooking.setNextName(reservationSite.getNextName());
siteBooking.setIsHalf(reservationSite.getIsHalf());
siteBooking.setHalfName(reservationSite.getHalfName());
@@ -758,17 +856,39 @@
List<QueryMySiteVo> queryMySiteVos = this.baseMapper.queryMySite(uid, status, pageNo, pageSize);
for (QueryMySiteVo queryMySiteVo : queryMySiteVos) {
SiteBooking siteBooking = siteBookingService.getById(queryMySiteVo.getId());
- Site site = this.getById(siteBooking.getSiteId());
String[] split = siteBooking.getTimes().split(";");
- if (site != null) {
- if (queryMySiteVo.getIsHalf() == 1) {
- queryMySiteVo.setPlayPaiCoin((int) (site.getPlayPaiCoinOne() * split.length));
+ // 所选时间段 所需总计金额
+ BigDecimal money = BigDecimal.ZERO;
+ BigDecimal playCoin = BigDecimal.ZERO;
+ for (String s : split) {
- } else {
- queryMySiteVo.setPlayPaiCoin(site.getPlayPaiCoin() * split.length);
-
+ 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());
+ 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());
+ break;
+ }
}
}
+ queryMySiteVo.setPlayPaiCoin(playCoin.setScale(0, RoundingMode.DOWN).intValue());
}
return queryMySiteVos;
}
@@ -908,23 +1028,34 @@
Site site = this.getById(siteBooking.getSiteId());
AppUser appUser = appUserClient.queryAppUser(uid);
String[] split = siteBooking.getTimes().split(";");
- Double payMoney = 0D;
- if (payType == 3) {
-// payMoney = new BigDecimal(site.getPlayPaiCoin()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
- if (appUser.getPlayPaiCoins().compareTo(payMoney.intValue()) < 0) {
- return ResultUtil.error("玩湃币不足");
- }
-
- if (siteBooking.getIsHalf() == 2) {
- payMoney = new BigDecimal(site.getPlayPaiCoin()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
- } else {
- payMoney = new BigDecimal(site.getPlayPaiCoinOne()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
- }
- } else {
- if (siteBooking.getIsHalf() == 2) {
- payMoney = new BigDecimal(site.getCashPrice()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
- } else {
- payMoney = new BigDecimal(site.getCashPriceOne()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ // 所选时间段 所需总计金额
+ BigDecimal money = BigDecimal.ZERO;
+ BigDecimal playCoin = BigDecimal.ZERO;
+ 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());
+ 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());
+ break;
+ }
}
}
@@ -938,12 +1069,12 @@
JSONObject jsonObject = JSON.parseObject(coupon.getContent());
Double num1 = jsonObject.getDouble("conditionalAmount");
Double num2 = jsonObject.getDouble("deductionAmount");
- payMoney = new BigDecimal(payMoney).subtract(new BigDecimal(num2)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ money = money.subtract(new BigDecimal(num2)).setScale(2, RoundingMode.HALF_EVEN);
}
if (coupon.getType() == 2) {//代金券
JSONObject jsonObject = JSON.parseObject(coupon.getContent());
Double num1 = jsonObject.getDouble("conditionalAmount");
- payMoney = new BigDecimal(payMoney).subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ money = money.subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN);
}
userCoupon.setStatus(2);
userCouponClient.updateUserCoupon(userCoupon);
@@ -957,19 +1088,19 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
siteBooking.setOrderNo(sdf.format(new Date()) + UUIDUtil.getNumberRandom(3));
siteBooking.setPayType(payType);
- siteBooking.setPayMoney(payMoney);
+ siteBooking.setPayMoney(money.doubleValue());
if (payType == 3) {
siteBooking.setUserCouponId(null);
}
siteBookingService.updateById(siteBooking);
if (payType == 1) {//微信支付
- return weChatPaymentSite(payMoney, siteBooking);
+ return weChatPaymentSite(money.doubleValue(), siteBooking);
}
if (payType == 2) {//支付宝支付
- return aliPaymentSite(payMoney, siteBooking);
+ return aliPaymentSite(money.doubleValue(), siteBooking);
}
if (payType == 3) {//玩湃币支付
- return playPaiCoinPaymentSite(appUser, payMoney, siteBooking);
+ return playPaiCoinPaymentSite(appUser, playCoin.doubleValue(), siteBooking);
}
return ResultUtil.success();
}
@@ -991,22 +1122,35 @@
Site site = this.getById(siteBooking.getSiteId());
String[] split = siteBooking.getTimes().split(";");
Map<String, Double> map = new HashMap<>();
- Double payMoney = new BigDecimal(site.getPlayPaiCoin()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
-
-
- if (siteBooking.getIsHalf() == 2) {
- payMoney = new BigDecimal(site.getPlayPaiCoin()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
- } else {
- payMoney = new BigDecimal(site.getPlayPaiCoinOne()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
- }
-
- map.put("playPaiCoin", payMoney);
- payMoney = new BigDecimal(site.getCashPrice()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
-
- if (siteBooking.getIsHalf() == 2) {
- payMoney = new BigDecimal(site.getCashPrice()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
- } else {
- payMoney = new BigDecimal(site.getCashPriceOne()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ // 所选时间段 所需总计金额
+ BigDecimal money = BigDecimal.ZERO;
+ BigDecimal playCoin = BigDecimal.ZERO;
+ 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());
+ 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());
+ break;
+ }
+ }
}
//校验优惠券
@@ -1019,15 +1163,24 @@
JSONObject jsonObject = JSON.parseObject(coupon.getContent());
Double num1 = jsonObject.getDouble("conditionalAmount");
Double num2 = jsonObject.getDouble("deductionAmount");
- payMoney = new BigDecimal(payMoney).subtract(new BigDecimal(num2)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ money = money.subtract(new BigDecimal(num2)).setScale(2, RoundingMode.HALF_EVEN);
}
if (coupon.getType() == 2) {//代金券
JSONObject jsonObject = JSON.parseObject(coupon.getContent());
Double num1 = jsonObject.getDouble("conditionalAmount");
- payMoney = new BigDecimal(payMoney).subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ money = money.subtract(new BigDecimal(num1)).setScale(2, RoundingMode.HALF_EVEN);
}
}
- map.put("cash", payMoney);
+ switch (siteBooking.getPayType()){
+ case 1:
+ map.put("cash", money.doubleValue());
+ break;
+ case 2:
+ map.put("cash", money.doubleValue());
+ break;
+ case 3:
+ map.put("cash", playCoin.doubleValue());
+ }
return ResultUtil.success(map);
}
--
Gitblit v1.7.1