From 3e09990298d9751bdf03e28f3935a02130440a74 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期四, 17 八月 2023 08:48:30 +0800
Subject: [PATCH] 客服管理、荣誉管理
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 27 ++++++++++++++-------------
1 files changed, 14 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 3d3f7e9..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
@@ -5,7 +5,9 @@
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;
@@ -302,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);
}
@@ -358,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;
}
/**
@@ -380,6 +379,7 @@
* @param appUserId
* @return
*/
+ @ResponseBody
@PostMapping("/base/site/queryPlaypaiGoldSiteDetail")
public List<SiteBooking> wanpaiGoldSiteBookingList(@RequestBody Integer appUserId){
ArrayList<Integer> integers = new ArrayList<>();
@@ -395,6 +395,7 @@
}
+ @ResponseBody
@PostMapping("/base/site/getNewAddSiteList")
public List<SiteVo> getAppUserSiteList(){
List<SiteVo> siteVos = new ArrayList<>();
--
Gitblit v1.7.1