xhxu 4 лет назад
Родитель
Сommit
ee7f28a01a
4 измененных файлов: 18 добавлений и 18 удалений
  1. +6
    -6
      mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java
  2. +7
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java
  3. +4
    -4
      mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java
  4. +1
    -1
      mallinkTTCApi/src/main/java/com/iformall/controller/TtUserGrantController.java

+ 6
- 6
mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java Просмотреть файл

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

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

public String getTenantId() {
return tenantId;


+ 7
- 7
mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java Просмотреть файл

@@ -46,16 +46,16 @@ public class WxCuserFloatingLayerServiceImpl implements WxCuserFloatingLayerServ
public WxFloatingLayer getFloatingLayer(String openId, String appId) {
WxAppinfo appinfo = appinfoMapper.findByAppId(appId);
if (StringUtils.isBlank(openId)) {
return getWxFloatingLayer(appinfo.getTenantInfo());
return getWxFloatingLayer(appinfo.getTenantId());
}
//1 查看是否存在用户,用户不存在 直接返回浮层信息
WxCUser user = new WxCUser();
user.setOpenId(openId);
user.setAppId(appId);
user.updateTenantInfo(appinfo);
user.setTenantId(appinfo.getTenantId());
WxCUser byOpenId = wxCUserMapper.findByOpenId(user);
if (byOpenId == null) {
return getWxFloatingLayer(appinfo.getTenantInfo());
return getWxFloatingLayer(appinfo.getTenantId());
}
//2 用户存在 查看是否已有弹出记录 没有 保存记录后返回浮层信息
WxCuserFloatingLayer wxCuserFloatingLayerQuery = new WxCuserFloatingLayer();
@@ -68,7 +68,7 @@ public class WxCuserFloatingLayerServiceImpl implements WxCuserFloatingLayerServ
logger.error("用户 {} 已弹过浮层",byOpenId.getId());
return null;
}
return getWxFloatingLayer(byOpenId);
return getWxFloatingLayer(byOpenId.getTenantId());
//merge from develop: 分支逻辑
// WxFloatingLayer wxFloatingLayer = getWxFloatingLayer(byOpenId);
// if (wxFloatingLayer != null) {
@@ -84,15 +84,15 @@ public class WxCuserFloatingLayerServiceImpl implements WxCuserFloatingLayerServ
wxCuserFloatingLayer = new WxCuserFloatingLayer();
final IdWorker idWorker = IdWorker.get();
wxCuserFloatingLayer.setId(idWorker.nextId());
wxCuserFloatingLayer.setTenantId(wxCUser.getTenantId());
wxCuserFloatingLayer.setUserId(wxCUser.getId());
wxCuserFloatingLayer.updateTenantInfo(wxCUser);
wxCuserFloatingLayer.setCreateTime(new Date());
wxCuserFloatingLayerMapper.insert(wxCuserFloatingLayer);
}

public WxFloatingLayer getWxFloatingLayer(TenantEntity tenantEntity) {
public WxFloatingLayer getWxFloatingLayer(String tenantId) {
WxFloatingLayer wxFloatingLayer = new WxFloatingLayer();
wxFloatingLayer.updateTenantInfo(tenantEntity);
wxFloatingLayer.setTenantId(tenantId);
wxFloatingLayer.setStatus(EnumFloatingLayerStatus.STATUS_THROW_IN.getCode());
return wxFloatingLayerMapper.selectOne(new QueryWrapper<>(wxFloatingLayer));
}


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/msg/impl/SendWeappUniformMsgServiceImpl.java Просмотреть файл

@@ -47,10 +47,10 @@ public class SendWeappUniformMsgServiceImpl implements MsgSendService {
public void send(BaseMsg baseMsg) throws Exception{
AppUniformMsg appUniformMsg = (AppUniformMsg)baseMsg;

TenantEntity tenantEntity = appUniformMsg.getTenantInfo();
if (StringUtils.isBlank(tenantEntity.getTenantId())) {
String tenantId = appUniformMsg.getTenantId();
if (StringUtils.isBlank(tenantId)) {
WxAppinfo appinfo = appinfoMapper.findByAppId(appUniformMsg.getAppId());
tenantEntity = appinfo.getTenantInfo();
tenantId = appinfo.getTenantId();
}
WxTemplateMsg msg = null;

@@ -58,7 +58,7 @@ public class SendWeappUniformMsgServiceImpl implements MsgSendService {

// 查询信息模板
WxTemplateMsg msgQ = new WxTemplateMsg();
msgQ.updateTenantInfo(tenantEntity);
msgQ.setTenantId(tenantId);
msgQ.setType(appUniformMsg.getTemplateType());
try {
msg = wxTemplateMsgMapper.selectOne(new QueryWrapper(msgQ));


+ 1
- 1
mallinkTTCApi/src/main/java/com/iformall/controller/TtUserGrantController.java Просмотреть файл

@@ -128,7 +128,7 @@ public class TtUserGrantController extends BaseController {
String ipaddress = IPUtil.getIpAddr(request);

TtCUser newUser = new TtCUser();
newUser.updateTenantInfo(wxAppinfo.getTenantInfo());
newUser.setTenantId(wxAppinfo.getTenantId());
newUser.setAppId(appId);
newUser.setOpenId(openId);



Загрузка…
Отмена
Сохранить