diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java index 7e1329db8..0373d6bfc 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java @@ -45,6 +45,7 @@ public class WxPayOrderController extends BaseController { public ResultData list(@ModelAttribute WxPayOrder wxPayOrder, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] WxPayOrderController::list"); if (null == wxPayOrder) wxPayOrder = new WxPayOrder(); + wxPayOrder.updateTenantInfo(getTenantInfo()); final PageInfo page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java index 37a3c6ed3..f0e14159f 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java @@ -1,10 +1,8 @@ package com.iformall.controller; -import cn.binarywang.wx.miniapp.api.WxMaService; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseCUserEntity; -import com.iformall.domain.po.tt.TtCUser; import com.iformall.enums.EnumAppPlat; import com.iformall.service.CUserTokenService; import com.iformall.utils.RedisCacheUtils; @@ -14,7 +12,6 @@ import com.iformall.common.ErrorCode; import com.iformall.domain.po.base.TenantEntity; import com.iformall.exception.MallinkException; import com.iformall.service.WxAppinfoService; -import com.iformall.service.WxBuserService; import com.iformall.service.WxMerchantBUserService; import com.iformall.service.wechat.FmOpenService; import com.iformall.utils.Constant; @@ -146,10 +143,6 @@ public class BaseController { return user; } - public void updateCacheCUser(String token,Object cuser) { - cUserTokenService.updateTokenCache(token, cuser); - } - @Deprecated public String getTenantId() { HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java index 15153583d..9bde82e34 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java @@ -164,7 +164,6 @@ public class WxInfoController extends BaseController { if (StringUtils.isNotBlank(buUser.getParentTenantId())) { request.setAttribute(Constant.PARENT_TENANT_ID, buUser.getParentTenantId()); } - updateCacheCUser(cUser.getToken(), cUser); return new ResultData(resultMap); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index b693979ac..5131272a6 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -492,6 +492,7 @@ public class WxMicroPayController extends BaseController { WxPayOrder qpo = new WxPayOrder(); qpo.setOrderId(microOrder.getId()); + qpo.updateTenantInfo(getTenantInfo()); WxPayOrder po = wxPayOrderService.getByObj(qpo); if (null == po) { return new ResultData(ErrorCode.PAY_ORDER_NOT_FOUND); diff --git a/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java b/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java index d3120bc12..ffbe4b2a1 100644 --- a/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java +++ b/mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java @@ -79,11 +79,13 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { throw new MallinkException(ErrorCode.NET_TOKEN_INVALID.getCode(), "URL:" + request.getRequestURL() + " token失效,请重新登录"); } + tenantId = user.getTenantId(); + parenTenantId = user.getParentTenantId(); request.setAttribute(Constant.LOGIN_USER_KEY, user.getId()); - request.setAttribute(Constant.TENANT_ID, user.getTenantId()); + request.setAttribute(Constant.TENANT_ID, tenantId); request.setAttribute(Constant.REQUEST_C_USER_KEY, user); - if (StringUtils.isNotBlank(user.getParentTenantId())) { - request.setAttribute(Constant.PARENT_TENANT_ID, user.getParentTenantId()); + if (StringUtils.isNotBlank(parenTenantId)) { + request.setAttribute(Constant.PARENT_TENANT_ID, parenTenantId); } }else if (!StringUtils.isBlank(bid)) { diff --git a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java index 05481b0f2..28a3f7b26 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/BaseController.java @@ -177,10 +177,6 @@ public class BaseController { cUserTokenService.removeTokenCache(baseuser.getToken()); } - public void updateCacheCUser(String token,Object cuser) { - cUserTokenService.updateTokenCache(token, cuser); - } - private WxCUserBasicInfo getCacheMember(Long memberId,String finalTenantId,String key,long seconds) throws MallinkException { // 缓存 WxCUserBasicInfo member = RedisCacheUtils.getCacheObject(objectCommonRedisTemplate, key, WxCUserBasicInfo.class); diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index 18a2294c2..2bb1c9d07 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -275,6 +275,7 @@ public class WxPayOrderController extends BaseController { if (null == wxPayOrder) { wxPayOrder = new WxPayOrder(); } + wxPayOrder.updateTenantInfo(getTenantInfo()); final PageInfo page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java index 29c192c31..26b1e29cf 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java @@ -267,7 +267,6 @@ public class WxUserGrantController extends BaseController { resultMap.put("token", cUser.getToken()); request.setAttribute(Constant.LOGIN_USER_KEY, cUser.getId()); - updateCacheCUser(cUser.getToken(), cUser); return new ResultData(resultMap); } diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/BasicCUserService.java b/mallinkService/src/main/java/com/iformall/service/cuser/BasicCUserService.java index c9fb27c53..8e47a18c4 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/BasicCUserService.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/BasicCUserService.java @@ -161,6 +161,13 @@ public class BasicCUserService { } } + public void setCache(String token,BaseCUserEntity baseUser) { + if (null != baseUser) { + String key = Constant.tokenPrev + token; + RedisCacheUtils.cache(objectCommonRedisTemplate, key, baseUser, 3600*24*3); + } + } + public void cleanCuserToken(String token){ String key = Constant.tokenPrev + token; if(baseCUserTokenRedisTemplate.hasKey(key)){ diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java index 7a927d71e..f91f1f495 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java @@ -188,6 +188,7 @@ public class TtBUserServiceAdapter extends BasicCUserService implements CUserSer ttBuserMapper.insert(user); } + updateTokenCache(user.getToken(), user); return user; } @@ -286,4 +287,9 @@ public class TtBUserServiceAdapter extends BasicCUserService implements CUserSer } } + private void updateTokenCache(String token,Object cuser) { + BaseCUserEntity baseUser = this.getByObj(cuser); + setCache(token,baseUser); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java index ca829d55c..d963295c1 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java @@ -237,6 +237,7 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer } wxCUserFrom.setCUserId(user.getId()); actionMsgAfterLogin(wxCUserFrom); + updateTokenCache(user.getToken(), user); return user; } @@ -355,4 +356,9 @@ public class TtCUserServiceAdapter extends BasicCUserService implements CUserSer ttCUserMapper.delForUserIdOnly(id,userId,tenantId); } + private void updateTokenCache(String token,Object cuser) { + BaseCUserEntity baseUser = this.getByObj(cuser); + setCache(token,baseUser); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java index 38d15d2b0..4a3883da2 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java @@ -188,6 +188,7 @@ public class WxBUserServiceAdapter extends BasicCUserService implements CUserSer wxBuserMapper.insert(user); } + updateTokenCache(user.getToken(), user); return user; } @@ -291,4 +292,9 @@ public class WxBUserServiceAdapter extends BasicCUserService implements CUserSer } } + private void updateTokenCache(String token,Object cuser) { + BaseCUserEntity baseUser = this.getByObj(cuser); + setCache(token,baseUser); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java index b8b6055af..401e3e091 100644 --- a/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java +++ b/mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java @@ -244,6 +244,7 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer } wxCUserFrom.setCUserId(user.getId()); actionMsgAfterLogin(wxCUserFrom); + updateTokenCache(user.getToken(), user); return user; } @@ -367,4 +368,9 @@ public class WxCUserServiceAdapter extends BasicCUserService implements CUserSer wxCUserMapper.delForUserIdOnly(id,userId,tenantId); } + private void updateTokenCache(String token,Object cuser) { + BaseCUserEntity baseUser = this.getByObj(cuser); + setCache(token,baseUser); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java index 03c8abdc4..1f97492e2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java @@ -129,6 +129,7 @@ public class WxBillSettleServiceImpl implements WxBillSettleService { //加载应收、承付、结余 WxBillSettle query = new WxBillSettle(); + query.updateTenantInfo(merchant); query.setId(id); query.setFilterSettleRecord(filterSettleRecord); query = wxBillSettleMapper.findList(query).get(0); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index a6d856c45..71b9b74f5 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -328,6 +328,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { //一个订单只有一条支付记录。 WxPayOrder orderq = new WxPayOrder(); orderq.setOrderId(composeOrder.getMainOrderId()); + orderq.updateTenantInfo(composeOrder); List list = wxPayOrderMapper.findList(orderq); WxPayOrder oldRecord = null; if (null != list && list.size() > 0) { @@ -473,6 +474,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { // 2. check 是否有支付订单 Date currentDate = new Date(); WxPayOrder pq = new WxPayOrder(); + pq.updateTenantInfo(order); pq.setOrderId(EnumComposeOrder.getPayOrderId(order)); List list = wxPayOrderMapper.findList(pq); String payOrderNo = "";