From c745c7a5feff68c429bbbb08133f9ef1a510a7ea Mon Sep 17 00:00:00 2001 From: xhxu Date: Fri, 25 Nov 2022 18:06:49 +0800 Subject: [PATCH] =?UTF-8?q?//=E6=8F=90=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/interceptor/AuthorizationInterceptor.java | 4 +++- .../com/iformall/service/impl/TtCouponGoodsServiceImpl.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index 720c66d37..5514dc0db 100644 --- a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -77,7 +77,9 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { if (!StringUtils.isBlank(mallTenantId)) { request.setAttribute(Constant.TENANT_ID, mallTenantId); - request.setAttribute(Constant.PARENT_TENANT_ID, cUser.getTenantId()); + if(!mallTenantId.equals(cUser.getTenantId())){ + request.setAttribute(Constant.PARENT_TENANT_ID, cUser.getTenantId()); + } }else { request.setAttribute(Constant.TENANT_ID, cUser.getTenantId()); if (StringUtils.isNotBlank(cUser.getParentTenantId())) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java index c5c6755e2..8e9a62d83 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/TtCouponGoodsServiceImpl.java @@ -529,6 +529,7 @@ public class TtCouponGoodsServiceImpl implements TtCouponGoodsService { map.put("path", Constant.mainPageUrl); Map paramMap = new HashMap<>(); paramMap.put("type","orderAffirm"); + paramMap.put("tenantId",tenantEntity.getTenantId()); paramMap.put("couponChannelId",couponChannelId); map.put("params",JSON.toJSONString(paramMap)); return JSON.toJSONString(map);