From f6ba3e15355e22767e69f8fc14ae22523f8db8dc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 8008cf7..83ca307 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
@@ -634,7 +634,11 @@
Site site = this.getById(siteBooking.getSiteId());
String[] split = siteBooking.getTimes().split(";");
if(site!=null){
- queryMySiteVo.setPlayPaiCoin(site.getPlayPaiCoin() * split.length);
+ if (queryMySiteVo.getIsHalf()==1) {
+ queryMySiteVo.setPlayPaiCoin(site.getPlayPaiCoin() * split.length);
+ }else {
+ queryMySiteVo.setPlayPaiCoin((int) (site.getPlayPaiCoinOne() * split.length));
+ }
}
}
return queryMySiteVos;
@@ -852,7 +856,7 @@
//校验优惠券
Long couponId = siteBooking.getUserCouponId();
- if(null != couponId){
+ if(null != couponId&&couponId!=0){
UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),siteBooking.getAppUserId()));
Coupon coupon = couponClient.queryCouponById(userCoupon.getCouponId());
if(coupon.getType() == 1){//满减
--
Gitblit v1.7.1