From 0f5d963e3c906983574fe537b0956e96628087a9 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 17 七月 2023 08:58:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
index cfb00ef..49d2b80 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/UserCouponController.java
@@ -2,9 +2,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.dsh.activity.entity.Coupon;
+import com.dsh.activity.entity.CouponStore;
import com.dsh.activity.entity.UserCoupon;
import com.dsh.activity.feignclient.model.CouponStuAvailableVo;
import com.dsh.activity.model.CouponListVo;
+import com.dsh.activity.service.CouponStoreService;
import com.dsh.activity.service.ICouponService;
import com.dsh.activity.service.UserCouponService;
import com.dsh.activity.util.ResultUtil;
@@ -29,9 +31,6 @@
public class UserCouponController {
@Autowired
- private UserCouponService uconService;
-
- @Autowired
private ICouponService cService;
@Autowired
@@ -39,6 +38,10 @@
@Autowired
private UserCouponService userCouponService;
+
+
+ @Autowired
+ private CouponStoreService csServie;
@@ -50,7 +53,7 @@
List<CouponStuAvailableVo> availableVos = new ArrayList<>();
- List<UserCoupon> list = uconService.list(new QueryWrapper<UserCoupon>()
+ List<UserCoupon> list = userCouponService.list(new QueryWrapper<UserCoupon>()
.eq("userId", appUserId)
.eq("status",1));
if (list.size() > 0){
@@ -127,4 +130,23 @@
return null;
}
}
+
+
+
+ @PostMapping("/userCoupon/queryCouponOfStore")
+ public List<Integer> getCouponStoreIds(@RequestBody Integer couponId){
+ try {
+ List<Integer> storeIds = new ArrayList<>();
+ List<CouponStore> list = csServie.list(new QueryWrapper<CouponStore>()
+ .eq("couponId",couponId));
+ if (list.size() > 0 ){
+ storeIds = list.stream().map(CouponStore::getStoreId).collect(Collectors.toList());
+ }
+ return storeIds;
+ }catch (Exception e){
+ e.printStackTrace();
+ return null;
+ }
+ }
+
}
--
Gitblit v1.7.1