From a1e4cfc3de4f3f3f3956b769bc7af40d097c8a4c Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 17 十月 2023 15:12:57 +0800
Subject: [PATCH] 修改bug
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 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 4d85cff..27297b4 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
@@ -105,6 +105,7 @@
Store store = storeService.getById(site.getStoreId());
QuerySiteInfoVo querySiteInfoVo = new QuerySiteInfoVo();
querySiteInfoVo.setId(site.getId());
+ querySiteInfoVo.setTypeName(site.getTypeName());
querySiteInfoVo.setName(site.getName());
querySiteInfoVo.setSiteTypeName(siteType.getName());
querySiteInfoVo.setStoreName(store.getName());
@@ -241,7 +242,11 @@
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
Double payMoney = 0D;
if(reservationSite.getPayType() == 3){
- payMoney = new BigDecimal(site.getCashPrice()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
+ if(reservationSite.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();
+ }
if(appUser.getPlayPaiCoins().compareTo(payMoney.intValue()) < 0){
return ResultUtil.error("玩湃币不足");
}
@@ -251,7 +256,7 @@
//校验优惠券
Long couponId = reservationSite.getCouponId();
- if (couponId != 0){
+ if (couponId!=null && couponId != 0){
if(null != couponId && reservationSite.getPayType() != 3){
UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(reservationSite.getCouponId(),uid));
@@ -324,7 +329,11 @@
return aliPaymentSite(payMoney, siteBooking);
}
if(reservationSite.getPayType() == 3){//玩湃币支付
- return playPaiCoinPaymentSite(appUser, payMoney, siteBooking);
+ if(reservationSite.getIsHalf()==2){
+ return playPaiCoinPaymentSite(appUser, Double.valueOf(site.getPlayPaiCoin()), siteBooking);
+ }else {
+ return playPaiCoinPaymentSite(appUser, site.getPlayPaiCoinOne(), siteBooking);
+ }
}
return ResultUtil.success();
}
--
Gitblit v1.7.1