From 801600b0b5ae9898cf509258e2afa1973fae1813 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 10:32:00 +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 | 44 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 42 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..4d85cff 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
@@ -63,6 +63,9 @@
@Autowired
private SiteMapper siteMapper;
+ @Autowired
+ private TBackRecordService backRecordService;
+
@@ -112,12 +115,17 @@
querySiteInfoVo.setStorePhone(store.getPhone());
querySiteInfoVo.setImgs(site.getImgs());
querySiteInfoVo.setDistance(0D);
+ querySiteInfoVo.setCashPriceOne(site.getCashPriceOne());
+ if(site.getPlayPaiCoinOne()!=null){
+ querySiteInfoVo.setPlayPaiCoinOne(site.getPlayPaiCoinOne().intValue());
+ }
+
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);
@@ -156,19 +164,29 @@
e.setTime(sdf.parse(day + " " + site.getAppointmentEndTime()));
int hour = e.get(Calendar.HOUR_OF_DAY);
+
int minute = e.get(Calendar.MINUTE);
+
List<QuerySiteTimes> list = new ArrayList<>();
+
SimpleDateFormat sdfs = new SimpleDateFormat("HH:mm");
+
while (true){
+
String start = sdfs.format(s.getTime());
s.set(Calendar.MINUTE, s.get(Calendar.MINUTE) + 30);
+
int e_hour = s.get(Calendar.HOUR_OF_DAY);
+
int e_minute = s.get(Calendar.MINUTE);
+
String end = sdfs.format(s.getTime());
QuerySiteTimes querySiteTimes = new QuerySiteTimes();
+
querySiteTimes.setTime(start + "-" + end);
+
querySiteTimes.setSelectable(1);
SiteBooking siteBooking = siteBookingService.getOne(new QueryWrapper<SiteBooking>().eq("siteId", id).eq("state", 1)
@@ -233,8 +251,12 @@
//校验优惠券
Long couponId = reservationSite.getCouponId();
+ if (couponId != 0){
+
if(null != couponId && reservationSite.getPayType() != 3){
UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(reservationSite.getCouponId(),uid));
+
+
if(userCoupon.getStatus() == 2){
return ResultUtil.error("优惠券已被核销");
}
@@ -264,6 +286,7 @@
}
userCoupon.setStatus(2);
userCouponClient.updateUserCoupon(userCoupon);
+ }
}
@@ -467,7 +490,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;
}
@@ -505,6 +531,13 @@
}
siteBooking.setCancelUserId(uid);
siteBookingService.updateById(siteBooking);
+
+ TBackRecord tBackRecord = new TBackRecord();
+ tBackRecord.setMoney(siteBooking.getPayMoney());
+ tBackRecord.setUserId(siteBooking.getAppUserId());
+ tBackRecord.setTime(new Date());
+ backRecordService.save(tBackRecord);
+
}
if(siteBooking.getPayType() == 2){//支付宝
Map<String, String> map = payMoneyUtil.aliRefund(siteBooking.getPayOrderNo(), siteBooking.getPayMoney().toString());
@@ -526,6 +559,13 @@
userCoupon.setStatus(1);
userCouponClient.updateUserCoupon(userCoupon);
}
+
+
+ TBackRecord tBackRecord = new TBackRecord();
+ tBackRecord.setMoney(siteBooking.getPayMoney());
+ tBackRecord.setUserId(siteBooking.getAppUserId());
+ tBackRecord.setTime(new Date());
+ backRecordService.save(tBackRecord);
}
if(siteBooking.getPayType() == 3){//玩湃币
--
Gitblit v1.7.1