From 852681bc9257e9eaae64d027a9bc6d88f93f35b4 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期六, 23 九月 2023 09:51:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java | 9 +++++++--
1 files changed, 7 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 e1de1aa..e2eb379 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
@@ -112,12 +112,14 @@
querySiteInfoVo.setStorePhone(store.getPhone());
querySiteInfoVo.setImgs(site.getImgs());
querySiteInfoVo.setDistance(0D);
+ querySiteInfoVo.setCashPriceOne(site.getCashPriceOne());
+ querySiteInfoVo.setPlayPaiCoinOne(site.getPlayPaiCoinOne());
querySiteInfoVo.setIntroduce(site.getIntroduce());
ArrayList<String> nextName = new ArrayList<>();
ArrayList<String> halfName = new ArrayList<>();
String nextName1 = site.getNextName();
String halfName1 = site.getHalfName();
-
+ querySiteInfoVo.setIshalf(site.getIshalf());
String[] split = nextName1.split(",");
for (String s : split) {
nextName.add(s);
@@ -467,7 +469,10 @@
SiteBooking siteBooking = siteBookingService.getById(queryMySiteVo.getId());
Site site = this.getById(siteBooking.getSiteId());
String[] split = siteBooking.getTimes().split(";");
- queryMySiteVo.setPlayPaiCoin(site.getPlayPaiCoin() * split.length);
+ if(site!=null){
+
+ queryMySiteVo.setPlayPaiCoin(site.getPlayPaiCoin() * split.length);
+ }
}
return queryMySiteVos;
}
--
Gitblit v1.7.1