提交代码

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<BsStoreDiscountActivity> userDiscountActivityList = new ArrayList<>();
+                List<BsStoreDiscountActivity> 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);
             }
 
             // 优惠活动