From c4fa4cd0c5a43d47b3623263153527e79da7bf75 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期二, 08 八月 2023 14:36:44 +0800
Subject: [PATCH] app端的福利主页账单的feign请求bug修复，商品详情修复
---
cloud-server-other/src/main/java/com/dsh/other/controller/SiteController.java | 25 ++++++++++++-------------
1 files changed, 12 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 420f390..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,6 +5,7 @@
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;
@@ -303,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);
}
@@ -362,19 +363,15 @@
* @param requestVo
* @return
*/
+ @ResponseBody
@PostMapping("/base/site/queryPaymentSiteDetail")
- public List<SiteBooking> getAllSiteBookingList(@RequestBody BillingDataRequestVo requestVo){
- 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",requestVo.getAppUserId())
- .between("payTime",requestVo.getMonthStart(),requestVo.getMonthEnd()));
+ 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;
}
/**
@@ -382,6 +379,7 @@
* @param appUserId
* @return
*/
+ @ResponseBody
@PostMapping("/base/site/queryPlaypaiGoldSiteDetail")
public List<SiteBooking> wanpaiGoldSiteBookingList(@RequestBody Integer appUserId){
ArrayList<Integer> integers = new ArrayList<>();
@@ -397,6 +395,7 @@
}
+ @ResponseBody
@PostMapping("/base/site/getNewAddSiteList")
public List<SiteVo> getAppUserSiteList(){
List<SiteVo> siteVos = new ArrayList<>();
--
Gitblit v1.7.1