From c01d417cdbb0b93d1261f7514c70d9b617ff6906 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 28 Nov 2022 23:06:44 +0800 Subject: [PATCH] //app test --- .../interceptor/AuthorizationInterceptor.java | 5 ++--- .../interceptor/AuthorizationInterceptor.java | 12 ------------ .../v1/miniApp/TtMiniAppPayAdapterService.java | 1 + .../refund/douyin/TtRefundAdapterService.java | 1 + 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index d5472cac7..150f90953 100644 --- a/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -101,6 +101,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { if (buser == null) { throw new MallinkException(ErrorCode.NET_TOKEN_INVALID.getCode(), "URL:" + request.getRequestURL() + " bid失效,请重新登录"); } + if(StringUtils.isNotBlank(mallTenantId)){ tenantId = mallTenantId; WxMall mall = wxMallService.getByTenantId(tenantId); @@ -122,9 +123,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { request.setAttribute(Constant.LOGIN_B_USER_KEY, buser.getId()); request.setAttribute(Constant.TENANT_ID, tenantId); - if (StringUtils.isNotBlank(parenTenantId)) { - request.setAttribute(Constant.PARENT_TENANT_ID, parenTenantId); - } + request.setAttribute(Constant.PARENT_TENANT_ID, parenTenantId); //如果是要不需要自动设置tenantI信息 TenantIgnore tenantIgnoreAnnotation = null; diff --git a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index a6071ed30..05b2e1a96 100644 --- a/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkCApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -105,18 +105,6 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { && !tenantId.equals(cUser.getParentTenantId())){ throw new MallinkException(ErrorCode.SYS_AUTH_ERROR); } - -// if (StringUtils.isNotBlank(mallTenantId)) { -// request.setAttribute(Constant.TENANT_ID, mallTenantId); -// request.setAttribute(Constant.PARENT_TENANT_ID, cUser.getTenantId()); -// request.setAttribute(Constant.IS_CHILD_MALL,true); -// }else { -// request.setAttribute(Constant.TENANT_ID, cUser.getTenantId()); -// if (StringUtils.isNotBlank(cUser.getParentTenantId())) { -// request.setAttribute(Constant.PARENT_TENANT_ID, cUser.getParentTenantId()); -// } -// request.setAttribute(Constant.IS_CHILD_MALL,false); -// } request.setAttribute(Constant.TENANT_ID, tenantId); request.setAttribute(Constant.PARENT_TENANT_ID, parenTenantId); diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v1/miniApp/TtMiniAppPayAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v1/miniApp/TtMiniAppPayAdapterService.java index 0b098b6c4..ef975ae89 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v1/miniApp/TtMiniAppPayAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/pay/douyin/v1/miniApp/TtMiniAppPayAdapterService.java @@ -134,6 +134,7 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen pageEntry.setPath(Constant.mainPageUrl); Map paramMap = new HashMap<>(); paramMap.put("type","dt"); + paramMap.put("tenantId",composeOrder.getTenantId()); paramMap.put("orderId",composeOrder.getMainOrderId()); pageEntry.setParams(JSON.toJSONString(paramMap)); request.setOrderEntrySchema(pageEntry); diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/TtRefundAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/TtRefundAdapterService.java index f111864bb..58d4d06d3 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/TtRefundAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/TtRefundAdapterService.java @@ -71,6 +71,7 @@ public class TtRefundAdapterService implements RefundPayAdapterService{ pageEntry.setPath(Constant.mainPageUrl); Map paramMap = new HashMap<>(); paramMap.put("type","dt"); + paramMap.put("tenantId",payOrder.getTenantId()); paramMap.put("orderId",payOrder.getId()); pageEntry.setParams(JSON.toJSONString(paramMap)); request.setOrderEntrySchema(pageEntry);