Browse Source

//tenant

release_toaliyun_real
xhxu 3 years ago
parent
commit
d39f61a192
2 changed files with 33 additions and 25 deletions
  1. +8
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java
  2. +25
    -22
      mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java

+ 8
- 3
mallinkAdmin/src/main/java/com/iformall/controller/market/WxProfitSharingOrderController.java View File

@@ -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);


}




+ 25
- 22
mallinkAdmin/src/main/java/com/iformall/interceptor/CurrentTenantInterceptor.java View File

@@ -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);


Loading…
Cancel
Save