From c743f4413a00fc063bbbd9d851b6d0c3fff10581 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 31 七月 2023 10:04:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 0 deletions(-)
diff --git a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
index 2b42da9..3d3f7e9 100644
--- a/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
+++ b/cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java
@@ -3,8 +3,10 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.other.entity.Site;
import com.dsh.other.entity.SiteBooking;
+import com.dsh.other.entity.SiteType;
import com.dsh.other.feignclient.activity.UserCouponClient;
import com.dsh.other.feignclient.activity.model.UserCoupon;
+import com.dsh.other.feignclient.model.SiteVo;
import com.dsh.other.model.*;
import com.dsh.other.service.ISiteBookingService;
import com.dsh.other.service.ISiteService;
@@ -22,6 +24,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -353,5 +356,65 @@
}
}
+ /**
+ * 查询所有现金支付的预约记录
+ * @param appUserId
+ * @return
+ */
+ @PostMapping("/base/site/queryPaymentSiteDetail")
+ public List<SiteBooking> getAllSiteBookingList(@RequestBody Integer appUserId){
+ ArrayList<Integer> integers = new ArrayList<>();
+ integers.add(1);
+ integers.add(2);
+ integers.add(3);
+ integers.add(4);
+ integers.add(5);
+ return siteBookingService.list(new QueryWrapper<SiteBooking>()
+ .in("status",integers)
+ .ne("payType",3)
+ .eq("appUserId",appUserId));
+ }
+
+ /**
+ * 查询所有玩湃币支付的预约记录
+ * @param appUserId
+ * @return
+ */
+ @PostMapping("/base/site/queryPlaypaiGoldSiteDetail")
+ public List<SiteBooking> wanpaiGoldSiteBookingList(@RequestBody Integer appUserId){
+ ArrayList<Integer> integers = new ArrayList<>();
+ integers.add(1);
+ integers.add(2);
+ integers.add(3);
+ integers.add(4);
+ integers.add(5);
+ return siteBookingService.list(new QueryWrapper<SiteBooking>()
+ .in("status",integers)
+ .eq("payType",3)
+ .eq("appUserId",appUserId));
+ }
+
+
+ @PostMapping("/base/site/getNewAddSiteList")
+ public List<SiteVo> getAppUserSiteList(){
+ List<SiteVo> siteVos = new ArrayList<>();
+
+ List<Site> list = siteService.list(new QueryWrapper<Site>()
+ .orderByDesc("insertTime"));
+ if (list.size() > 0 ){
+ for (Site site : list) {
+ SiteVo vo = new SiteVo();
+ vo.setSiteId(site.getId());
+ vo.setSiteName(site.getName());
+ vo.setSiteTime(site.getAppointmentStartTime() + "-" + site.getAppointmentEndTime());
+ SiteType byId = siteTypeService.getById(site.getSiteTypeId());
+ vo.setSiteType(byId.getName());
+ vo.setPrice(site.getCashPrice());
+ siteVos.add(vo);
+ }
+ }
+ return siteVos;
+
+ }
}
--
Gitblit v1.7.1