From 276571374e8f0e2be2bdcfc5e8ea4a39af1599bc Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 01 八月 2023 09:42:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..420f390 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
@@ -6,6 +6,7 @@
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.BillingDataRequestVo;
import com.dsh.other.feignclient.model.SiteVo;
import com.dsh.other.model.*;
import com.dsh.other.service.ISiteBookingService;
@@ -358,11 +359,11 @@
/**
* 查询所有现金支付的预约记录
- * @param appUserId
+ * @param requestVo
* @return
*/
@PostMapping("/base/site/queryPaymentSiteDetail")
- public List<SiteBooking> getAllSiteBookingList(@RequestBody Integer appUserId){
+ public List<SiteBooking> getAllSiteBookingList(@RequestBody BillingDataRequestVo requestVo){
ArrayList<Integer> integers = new ArrayList<>();
integers.add(1);
integers.add(2);
@@ -372,7 +373,8 @@
return siteBookingService.list(new QueryWrapper<SiteBooking>()
.in("status",integers)
.ne("payType",3)
- .eq("appUserId",appUserId));
+ .eq("appUserId",requestVo.getAppUserId())
+ .between("payTime",requestVo.getMonthStart(),requestVo.getMonthEnd()));
}
/**
--
Gitblit v1.7.1