diff --git a/mallinkService/src/main/java/com/iformall/service/WxMsgModelService.java b/mallinkService/src/main/java/com/iformall/service/WxMsgModelService.java index 910dbcc58..b74e62b09 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMsgModelService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMsgModelService.java @@ -25,18 +25,19 @@ public interface WxMsgModelService { */ WxMsgModel getById(Long id); - /** + /** * 保存或更新实体 * * @param record */ - ResultData saveOrUpdate(WxMsgModel record); + ResultData saveOrUpdate(WxMsgModel record); /** * 根据Id删除实体 * * @param id */ + void deleteById(Long id); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java index 1b76c5bd4..3f465acbe 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java @@ -50,7 +50,7 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { //从短信配置中查询密钥 bid 等信息 WxMsgConfig wxMsgConfig = new WxMsgConfig(); - wxMsgConfig.setTenantId(wxMsgModel.getTenantId()); + wxMsgConfig.updateTenantInfo(wxMsgModel); List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); if (wxMsgConfigs.size() == 0) return new ResultData(ErrorCode.MSG_SERVER_NOT_FIND.getCode(), "您还未接入短信运营商,请联系平台管理员"); @@ -82,7 +82,6 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { if (wxMsgModel.getId() == null) { final IdWorker idWorker = IdWorker.get(); wxMsgModel.setId(idWorker.nextId()); - wxMsgModel.updateTenantInfo(wxMsgModel); if(jsonObjectResult.get("data") != null){ String data = jsonObjectResult.get("data").toString(); wxMsgModel.setModelId(Integer.valueOf(data)); @@ -109,7 +108,6 @@ public class WxMsgModelServiceImpl implements WxMsgModelService { if (wxMsgModel.getId() == null) { final IdWorker idWorker = IdWorker.get(); wxMsgModel.setId(idWorker.nextId()); - wxMsgModel.updateTenantInfo(wxMsgModel); wxMsgModel.setCreatetime(new Date()); wxMsgModel.setStatus(1); wxMsgModelMapper.insert(wxMsgModel); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java index 2dff2ce9e..60b94b759 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -213,9 +213,8 @@ public class WxMsgServiceImpl implements WxMsgService { @Override public ResultData add(WxMsg wxMsg){ - TenantEntity tenantEntity = new TenantEntity(); - tenantEntity.setTenantId(wxMsg.getTenantId()); - tenantEntity.setParentTenantId(wxMsg.getParentTenantId()); + + TenantEntity tenantEntity = wxMsg.getTenantInfo(); //不是草稿检验疲劳度 if (!wxMsg.getStatus().equals(EnumMsgStatus.MSG_STATUS_DRAFT.getCode())) {