From e16180612c9dfe2e879f79039d4670640867331d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 25 十月 2023 11:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
index 208e0cb..fced99b 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -228,7 +228,21 @@
@ResponseBody
@PostMapping("/base/coupon/queryCouponListSearch")
public List<Map<String,Object>> getCouponListOfSearch(@RequestBody CouponListOfSearch ofSearch){
- List<Map<String, Object>> mapList = couponService.queryCouponListOfSearch(ofSearch);
+ List<Map<String, Object>> mapList1 = couponService.queryCouponListOfSearch(ofSearch);
+ List<Map<String, Object>> mapList = new ArrayList<>();
+
+ if(ofSearch.getStoreId()!=null){
+ for (Map<String, Object> map : mapList1) {
+ List<CouponStore> id = couStoreService.list(new LambdaQueryWrapper<CouponStore>().eq(CouponStore::getCouponId, map.get("id").toString()));
+ List<Integer> collect = id.stream().map(CouponStore::getStoreId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
+ if(collect.contains(ofSearch.getStoreId())){
+ mapList.add(map);
+ }
+ }
+ }
if (mapList.size() > 0){
for (Map<String, Object> stringObjectMap : mapList) {
Integer o = (Integer) stringObjectMap.get("id");
--
Gitblit v1.7.1