From 26e2592813b9263124d518d238262910e817d323 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 14 八月 2023 10:13:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 51 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 38 insertions(+), 13 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 5111d86..f05c175 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,12 @@
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.QueryUserCouponByIdAndUserId;
import com.dsh.other.feignclient.activity.model.UserCoupon;
+import com.dsh.other.feignclient.model.BillingDataRequestVo;
+import com.dsh.other.feignclient.model.SiteVo;
import com.dsh.other.model.*;
import com.dsh.other.service.ISiteBookingService;
import com.dsh.other.service.ISiteService;
@@ -300,7 +304,7 @@
siteBooking.setRefundOrderNo(refund_id);
siteBookingService.updateById(siteBooking);
if(null != siteBooking.getUserCouponId()){
- UserCoupon userCoupon = userCouponClient.queryUserCouponById(siteBooking.getUserCouponId());
+ UserCoupon userCoupon = userCouponClient.queryUserCouponById(new QueryUserCouponByIdAndUserId(siteBooking.getUserCouponId(),siteBooking.getAppUserId()));
userCoupon.setStatus(1);
userCouponClient.updateUserCoupon(userCoupon);
}
@@ -356,21 +360,18 @@
/**
* 查询所有现金支付的预约记录
- * @param appUserId
+ * @param requestVo
* @return
*/
+ @ResponseBody
@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));
+ public RequestOfTypeVo getAllSiteBookingList(@RequestBody BillingDataRequestVo requestVo){
+ RequestOfTypeVo typeVo = new RequestOfTypeVo();
+ List<BillingRequestOfType> billingRequestOfTypes = siteBookingService.queryDatas(requestVo.getAppUserId(), requestVo.getMonthStart(), requestVo.getMonthEnd());
+ if (billingRequestOfTypes.size() > 0 ){
+ typeVo.setRequest(billingRequestOfTypes);
+ }
+ return typeVo;
}
/**
@@ -378,6 +379,7 @@
* @param appUserId
* @return
*/
+ @ResponseBody
@PostMapping("/base/site/queryPlaypaiGoldSiteDetail")
public List<SiteBooking> wanpaiGoldSiteBookingList(@RequestBody Integer appUserId){
ArrayList<Integer> integers = new ArrayList<>();
@@ -393,4 +395,27 @@
}
+ @ResponseBody
+ @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