Parcourir la source

fix bug

release_toaliyun_real
xiaohanzi il y a 5 ans
Parent
révision
31bcb0d075
2 fichiers modifiés avec 3 ajouts et 9 suppressions
  1. +3
    -6
      mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java
  2. +0
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java

+ 3
- 6
mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java Voir le fichier

@@ -58,12 +58,9 @@ public class BaseTenantEntity extends BaseEntity {
} }


public TenantEntity getTenantInfo() { public TenantEntity getTenantInfo() {
// TenantEntity tenantEntity = new TenantEntity();
// tenantEntity.setTenantId(tenantId);
// return tenantEntity;
return new TenantEntity() {{
setTenantId(tenantId);
}};
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(tenantId);
return tenantEntity;
} }


public String getTenantId() { public String getTenantId() {


+ 0
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java Voir le fichier

@@ -45,7 +45,6 @@ public class WxCuserFloatingLayerServiceImpl implements WxCuserFloatingLayerServ
@Override @Override
public WxFloatingLayer getFloatingLayer(String openId, String appId) { public WxFloatingLayer getFloatingLayer(String openId, String appId) {
WxAppinfo appinfo = appinfoMapper.findByAppId(appId); WxAppinfo appinfo = appinfoMapper.findByAppId(appId);
openId = "";
if (StringUtils.isBlank(openId)) { if (StringUtils.isBlank(openId)) {
return getWxFloatingLayer(appinfo.getTenantInfo()); return getWxFloatingLayer(appinfo.getTenantInfo());
} }
@@ -55,7 +54,6 @@ public class WxCuserFloatingLayerServiceImpl implements WxCuserFloatingLayerServ
user.setAppId(appId); user.setAppId(appId);
user.updateTenantInfo(appinfo); user.updateTenantInfo(appinfo);
WxCUser byOpenId = wxCUserMapper.findByOpenId(user); WxCUser byOpenId = wxCUserMapper.findByOpenId(user);
logger.info("appinfo.gettenantinfo"+appinfo.getTenantInfo().getTenantId());
if (byOpenId == null) { if (byOpenId == null) {
return getWxFloatingLayer(appinfo.getTenantInfo()); return getWxFloatingLayer(appinfo.getTenantInfo());
} }
@@ -93,7 +91,6 @@ public class WxCuserFloatingLayerServiceImpl implements WxCuserFloatingLayerServ
} }


public WxFloatingLayer getWxFloatingLayer(TenantEntity tenantEntity) { public WxFloatingLayer getWxFloatingLayer(TenantEntity tenantEntity) {
logger.info(" >>>>>>>>>>>>>>>>>>>>>>> tenantentity info "+tenantEntity);
WxFloatingLayer wxFloatingLayer = new WxFloatingLayer(); WxFloatingLayer wxFloatingLayer = new WxFloatingLayer();
wxFloatingLayer.updateTenantInfo(tenantEntity); wxFloatingLayer.updateTenantInfo(tenantEntity);
wxFloatingLayer.setStatus(EnumFloatingLayerStatus.STATUS_THROW_IN.getCode()); wxFloatingLayer.setStatus(EnumFloatingLayerStatus.STATUS_THROW_IN.getCode());


Chargement…
Annuler
Enregistrer