From 1b8ad0cc6a79f84fb32fdffae39742afa964748e Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 24 九月 2024 16:09:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 5 +++++
1 files changed, 5 insertions(+), 0 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 d3c2feb..219f9f3 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
@@ -325,11 +325,16 @@
}
if (ofSearch.getStoreId() != null || ofSearch.getStoreIds().size() != 0) {
for (Map<String, Object> map : mapList1) {
+ if (map.get("cityManagerId").equals(ofSearch.getOperatorId())){
+ mapList.add(map);
+ continue;
+ }
// 如果当前登陆人是运营商 只能查看平台添加的优惠券应只展示使用范围为全国通用、
// 指定城市有运营商管辖的、指定门店有运营商旗下门店
if (ofSearch.getObjType() == 2) {
if (Integer.parseInt(String.valueOf(map.get("useScope"))) == 1) {
mapList.add(map);
+ continue;
}
if (Integer.parseInt(String.valueOf(map.get("useScope"))) == 2) {
// 获取到优惠券id 查询这个优惠券指定了哪些城市
--
Gitblit v1.7.1