Procházet zdrojové kódy

Merge branch 'release_toaliyun_real_202111' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_202111

release_toaliyun_real
xiaohanzi před 4 roky
rodič
revize
9579f39c9c
15 změnil soubory, kde provedl 42 přidání a 16 odebrání
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java
  2. +0
    -7
      mallinkBApi/src/main/java/com/iformall/controller/BaseController.java
  3. +0
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java
  4. +1
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java
  5. +5
    -3
      mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
  6. +0
    -4
      mallinkCApi/src/main/java/com/iformall/controller/BaseController.java
  7. +1
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  8. +0
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  9. +7
    -0
      mallinkService/src/main/java/com/iformall/service/cuser/BasicCUserService.java
  10. +6
    -0
      mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java
  11. +6
    -0
      mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java
  12. +6
    -0
      mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java
  13. +6
    -0
      mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java
  14. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java
  15. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxPayOrderController.java Zobrazit soubor

@@ -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<WxPayOrder> page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize);
return new ResultData(page);
}


+ 0
- 7
mallinkBApi/src/main/java/com/iformall/controller/BaseController.java Zobrazit soubor

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


+ 0
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java Zobrazit soubor

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

}


+ 1
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java Zobrazit soubor

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


+ 5
- 3
mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java Zobrazit soubor

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


+ 0
- 4
mallinkCApi/src/main/java/com/iformall/controller/BaseController.java Zobrazit soubor

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


+ 1
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java Zobrazit soubor

@@ -275,6 +275,7 @@ public class WxPayOrderController extends BaseController {
if (null == wxPayOrder) {
wxPayOrder = new WxPayOrder();
}
wxPayOrder.updateTenantInfo(getTenantInfo());
final PageInfo<WxPayOrder> page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize);
return new ResultData(page);
}


+ 0
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Zobrazit soubor

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



+ 7
- 0
mallinkService/src/main/java/com/iformall/service/cuser/BasicCUserService.java Zobrazit soubor

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


+ 6
- 0
mallinkService/src/main/java/com/iformall/service/cuser/tt/TtBUserServiceAdapter.java Zobrazit soubor

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

}

+ 6
- 0
mallinkService/src/main/java/com/iformall/service/cuser/tt/TtCUserServiceAdapter.java Zobrazit soubor

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

}

+ 6
- 0
mallinkService/src/main/java/com/iformall/service/cuser/wx/WxBUserServiceAdapter.java Zobrazit soubor

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

}

+ 6
- 0
mallinkService/src/main/java/com/iformall/service/cuser/wx/WxCUserServiceAdapter.java Zobrazit soubor

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

}

+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxBillSettleServiceImpl.java Zobrazit soubor

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


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java Zobrazit soubor

@@ -328,6 +328,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
//一个订单只有一条支付记录。
WxPayOrder orderq = new WxPayOrder();
orderq.setOrderId(composeOrder.getMainOrderId());
orderq.updateTenantInfo(composeOrder);
List<WxPayOrder> 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<WxPayOrder> list = wxPayOrderMapper.findList(pq);
String payOrderNo = "";


Načítá se…
Zrušit
Uložit