| @@ -101,6 +101,7 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { | |||||
| if (buser == null) { | if (buser == null) { | ||||
| throw new MallinkException(ErrorCode.NET_TOKEN_INVALID.getCode(), "URL:" + request.getRequestURL() + " bid失效,请重新登录"); | throw new MallinkException(ErrorCode.NET_TOKEN_INVALID.getCode(), "URL:" + request.getRequestURL() + " bid失效,请重新登录"); | ||||
| } | } | ||||
| if(StringUtils.isNotBlank(mallTenantId)){ | if(StringUtils.isNotBlank(mallTenantId)){ | ||||
| tenantId = mallTenantId; | tenantId = mallTenantId; | ||||
| WxMall mall = wxMallService.getByTenantId(tenantId); | 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.LOGIN_B_USER_KEY, buser.getId()); | ||||
| request.setAttribute(Constant.TENANT_ID, tenantId); | 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信息 | //如果是要不需要自动设置tenantI信息 | ||||
| TenantIgnore tenantIgnoreAnnotation = null; | TenantIgnore tenantIgnoreAnnotation = null; | ||||
| @@ -105,18 +105,6 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { | |||||
| && !tenantId.equals(cUser.getParentTenantId())){ | && !tenantId.equals(cUser.getParentTenantId())){ | ||||
| throw new MallinkException(ErrorCode.SYS_AUTH_ERROR); | 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.TENANT_ID, tenantId); | ||||
| request.setAttribute(Constant.PARENT_TENANT_ID, parenTenantId); | request.setAttribute(Constant.PARENT_TENANT_ID, parenTenantId); | ||||
| @@ -134,6 +134,7 @@ public class TtMiniAppPayAdapterService extends BaseTtPayAdapterService implemen | |||||
| pageEntry.setPath(Constant.mainPageUrl); | pageEntry.setPath(Constant.mainPageUrl); | ||||
| Map<String,Object> paramMap = new HashMap<>(); | Map<String,Object> paramMap = new HashMap<>(); | ||||
| paramMap.put("type","dt"); | paramMap.put("type","dt"); | ||||
| paramMap.put("tenantId",composeOrder.getTenantId()); | |||||
| paramMap.put("orderId",composeOrder.getMainOrderId()); | paramMap.put("orderId",composeOrder.getMainOrderId()); | ||||
| pageEntry.setParams(JSON.toJSONString(paramMap)); | pageEntry.setParams(JSON.toJSONString(paramMap)); | ||||
| request.setOrderEntrySchema(pageEntry); | request.setOrderEntrySchema(pageEntry); | ||||
| @@ -71,6 +71,7 @@ public class TtRefundAdapterService implements RefundPayAdapterService{ | |||||
| pageEntry.setPath(Constant.mainPageUrl); | pageEntry.setPath(Constant.mainPageUrl); | ||||
| Map<String,Object> paramMap = new HashMap<>(); | Map<String,Object> paramMap = new HashMap<>(); | ||||
| paramMap.put("type","dt"); | paramMap.put("type","dt"); | ||||
| paramMap.put("tenantId",payOrder.getTenantId()); | |||||
| paramMap.put("orderId",payOrder.getId()); | paramMap.put("orderId",payOrder.getId()); | ||||
| pageEntry.setParams(JSON.toJSONString(paramMap)); | pageEntry.setParams(JSON.toJSONString(paramMap)); | ||||
| request.setOrderEntrySchema(pageEntry); | request.setOrderEntrySchema(pageEntry); | ||||