From 1ea12fd0fb1ebf83d2b85f298b5563d8a17a22e7 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Wed, 31 May 2023 11:03:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cweb/controller/BsPayQrCodeController.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cweb/src/main/java/com/cweb/controller/BsPayQrCodeController.java b/cweb/src/main/java/com/cweb/controller/BsPayQrCodeController.java index ba8b5c4..806d86a 100644 --- a/cweb/src/main/java/com/cweb/controller/BsPayQrCodeController.java +++ b/cweb/src/main/java/com/cweb/controller/BsPayQrCodeController.java @@ -110,7 +110,11 @@ public class BsPayQrCodeController { // 用户优惠 if (StringUtils.isNotBlank(body.getString("phone"))) { - discountActivityList.addAll(storeDiscountActivityService.getUseDiscountListByPhone(body.getString("phone"))); + List userDiscountActivityList = new ArrayList<>(); + List userDiscountActivity = storeDiscountActivityService.getUseDiscountListByPhone(body.getString("phone")); + userDiscountActivityList.addAll(userDiscountActivity.stream().filter(o -> o.getMerId().equals(store.getMerId())).collect(Collectors.toList())); + userDiscountActivityList.addAll(userDiscountActivity.stream().filter(o -> o.getStoreId().equals(store.getId())).collect(Collectors.toList())); + discountActivityList.addAll(userDiscountActivityList); } // 优惠活动