From 624c9eec90d59297800f03276f8518daa1bd9f94 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 04 八月 2023 09:23:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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..b0f032d 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,11 +360,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 +374,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