xhxu 4 лет назад
Родитель
Сommit
6609808744
3 измененных файлов: 6 добавлений и 8 удалений
  1. +3
    -2
      mallinkService/src/main/java/com/iformall/service/WxMsgModelService.java
  2. +1
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java
  3. +2
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java

+ 3
- 2
mallinkService/src/main/java/com/iformall/service/WxMsgModelService.java Просмотреть файл

@@ -25,18 +25,19 @@ public interface WxMsgModelService {
*/ */
WxMsgModel getById(Long id); WxMsgModel getById(Long id);
/**
/**
* 保存或更新实体 * 保存或更新实体
* *
* @param record * @param record
*/ */
ResultData saveOrUpdate(WxMsgModel record);
ResultData saveOrUpdate(WxMsgModel record);


/** /**
* 根据Id删除实体 * 根据Id删除实体
* *
* @param id * @param id
*/ */

void deleteById(Long id); void deleteById(Long id);






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

@@ -50,7 +50,7 @@ public class WxMsgModelServiceImpl implements WxMsgModelService {


//从短信配置中查询密钥 bid 等信息 //从短信配置中查询密钥 bid 等信息
WxMsgConfig wxMsgConfig = new WxMsgConfig(); WxMsgConfig wxMsgConfig = new WxMsgConfig();
wxMsgConfig.setTenantId(wxMsgModel.getTenantId());
wxMsgConfig.updateTenantInfo(wxMsgModel);
List<WxMsgConfig> wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); List<WxMsgConfig> wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig);
if (wxMsgConfigs.size() == 0) if (wxMsgConfigs.size() == 0)
return new ResultData(ErrorCode.MSG_SERVER_NOT_FIND.getCode(), "您还未接入短信运营商,请联系平台管理员"); return new ResultData(ErrorCode.MSG_SERVER_NOT_FIND.getCode(), "您还未接入短信运营商,请联系平台管理员");
@@ -82,7 +82,6 @@ public class WxMsgModelServiceImpl implements WxMsgModelService {
if (wxMsgModel.getId() == null) { if (wxMsgModel.getId() == null) {
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
wxMsgModel.setId(idWorker.nextId()); wxMsgModel.setId(idWorker.nextId());
wxMsgModel.updateTenantInfo(wxMsgModel);
if(jsonObjectResult.get("data") != null){ if(jsonObjectResult.get("data") != null){
String data = jsonObjectResult.get("data").toString(); String data = jsonObjectResult.get("data").toString();
wxMsgModel.setModelId(Integer.valueOf(data)); wxMsgModel.setModelId(Integer.valueOf(data));
@@ -109,7 +108,6 @@ public class WxMsgModelServiceImpl implements WxMsgModelService {
if (wxMsgModel.getId() == null) { if (wxMsgModel.getId() == null) {
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
wxMsgModel.setId(idWorker.nextId()); wxMsgModel.setId(idWorker.nextId());
wxMsgModel.updateTenantInfo(wxMsgModel);
wxMsgModel.setCreatetime(new Date()); wxMsgModel.setCreatetime(new Date());
wxMsgModel.setStatus(1); wxMsgModel.setStatus(1);
wxMsgModelMapper.insert(wxMsgModel); wxMsgModelMapper.insert(wxMsgModel);


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

@@ -213,9 +213,8 @@ public class WxMsgServiceImpl implements WxMsgService {


@Override @Override
public ResultData add(WxMsg wxMsg){ 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())) { if (!wxMsg.getStatus().equals(EnumMsgStatus.MSG_STATUS_DRAFT.getCode())) {


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