From d39f61a192417363cbd7b1a40ce1940ecb00ee57 Mon Sep 17 00:00:00 2001 From: xhxu Date: Wed, 28 Dec 2022 16:47:56 +0800 Subject: [PATCH] //tenant --- .../WxProfitSharingOrderController.java | 11 +++-- .../interceptor/CurrentTenantInterceptor.java | 47 ++++++++++--------- 2 files changed, 33 insertions(+), 25 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java index 3d32067d7..afe105179 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java @@ -109,14 +109,19 @@ public class WxProfitSharingOrderController extends BaseController { } - + @TenantIgnore @ApiOperation("分账详情") @GetMapping("findOrderDetails") @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) @SystemControllerLog(description = "分账订单-分账详情") - public ResultData findOrderDetails(Long id) { + public ResultData findOrderDetails(Long id,String mallTenantId) { logger.debug("[" + getIpAddr() + "] WxProfitSharingOrderController::findOrderDetails"); - return wxProfitSharingOrderService.findOrderDetails(id,getTenantInfo().getTenantId()); + if(StringUtils.isBlank(mallTenantId) || "undefined".equals(mallTenantId)){ + mallTenantId = getTenantInfo().getTenantId(); + } + return wxProfitSharingOrderService.findOrderDetails(id,mallTenantId); + + } diff --git a/mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java b/mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java index e433667b6..ce83d98b0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java +++ b/mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java @@ -32,29 +32,32 @@ public class CurrentTenantInterceptor extends HandlerInterceptorAdapter { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { //集团版中针对某一商场的业务需要传递mallTenantId - String mallTenantId = request.getHeader("mallTenantId"); - if(StringUtils.isBlank(mallTenantId)){ - mallTenantId = request.getParameter("mallTenantId"); - } - if(StringUtils.isBlank(mallTenantId)){ - try{ - String body = ((BodyReaderHttpServletRequestWrapper) request).getBody(); - mallTenantId = JSONObject.parseObject(body).getString("mallTenantId"); - }catch(Exception e){} - } +// String mallTenantId = request.getHeader("mallTenantId"); +// if(StringUtils.isBlank(mallTenantId)){ +// mallTenantId = request.getParameter("mallTenantId"); +// } +// if(StringUtils.isBlank(mallTenantId)){ +// try{ +// String body = ((BodyReaderHttpServletRequestWrapper) request).getBody(); +// mallTenantId = JSONObject.parseObject(body).getString("mallTenantId"); +// }catch(Exception e){} +// } +// +// String tenantId = null; +// String parenTenantId = null; +// if(StringUtils.isNotBlank(mallTenantId) && !"undefined".equals(mallTenantId)){ +// tenantId = mallTenantId; +// WxMall mall = wxMallService.getByTenantId(tenantId); +// if(StringUtils.isNotBlank(mall.getParentTenantId())){ +// parenTenantId = mall.getParentTenantId(); +// } +// }else{ +// tenantId = (String)request.getSession().getAttribute(UserSession.tenantId); +// parenTenantId = (String)request.getSession().getAttribute(UserSession.parentTenantId); +// } - String tenantId = null; - String parenTenantId = null; - if(StringUtils.isNotBlank(mallTenantId) && !"undefined".equals(mallTenantId)){ - tenantId = mallTenantId; - WxMall mall = wxMallService.getByTenantId(tenantId); - if(StringUtils.isNotBlank(mall.getParentTenantId())){ - parenTenantId = mall.getParentTenantId(); - } - }else{ - tenantId = (String)request.getSession().getAttribute(UserSession.tenantId); - parenTenantId = (String)request.getSession().getAttribute(UserSession.parentTenantId); - } + String tenantId = (String)request.getSession().getAttribute(UserSession.tenantId); + String parenTenantId = (String)request.getSession().getAttribute(UserSession.parentTenantId); TenantThreadLocal.setCurrentThreadTenant(tenantId, parenTenantId);