Просмотр исходного кода

[标签短信][修改]查询问题、错误代码提示

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
f42aa168c8
4 измененных файлов: 20 добавлений и 8 удалений
  1. +1
    -0
      mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java
  2. +12
    -2
      mallinkService/src/main/java/com/simple/common/ErrorCode.java
  3. +6
    -5
      mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml

+ 1
- 0
mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java Просмотреть файл

@@ -28,6 +28,7 @@ public class WxMsgModelController extends BaseController
@ApiImplicitParam(name="pageSize",value="每页条数",dataType="int", paramType = "query",required=true)})
public ResultData list(@ModelAttribute WxMsgModel wxMsgModel,Integer pageNum, Integer pageSize) {
if (null == wxMsgModel) wxMsgModel = new WxMsgModel();
wxMsgModel.setTenantId(getTenantId());
final PageInfo<WxMsgModel> page = wxMsgModelService.listAsPage(wxMsgModel, pageNum, pageSize);
return new ResultData(page);
}


+ 12
- 2
mallinkService/src/main/java/com/simple/common/ErrorCode.java Просмотреть файл

@@ -174,10 +174,20 @@ public enum ErrorCode{
/**
* 模板消息
*/
TEMPLATE_NOT_FOUND(12090, "模板不存在")
;
TEMPLATE_NOT_FOUND(12090, "模板不存在"),

/**
*
* 短信
*
* */
MSG_SERVER_NOT_FIND(12100,"您还未接入短信运营商,请联系平台管理员"),
MSG_TEMPLATE_REPEAT(12101,"您添加的短信模板已存在"),
MSG_SIGNATURE_CONTENT_ERROR(12102,"短信签名或内容错误"),
MSG_TEMPLATE_CREATE_ERROR(12103,"创建模板失败"),


;

private int code;
private String message;


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

@@ -3,6 +3,7 @@ package com.simple.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.simple.common.ErrorCode;
import com.simple.common.IdWorker;
import com.simple.common.Result;
import com.simple.common.ResultData;
@@ -46,7 +47,7 @@ public class WxMsgModelServiceImpl implements WxMsgModelService {
WxMsgConfig wxMsgConfig = new WxMsgConfig();
wxMsgConfig.setTenantId(wxMsgModel.getTenantId());
List<WxMsgConfig> wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig);
if(wxMsgConfigs.size()==0)return new ResultData(Result.SUCCESS, "您还未接入短信运营商,请联系平台管理员");
if(wxMsgConfigs.size()==0)return new ResultData(ErrorCode.MSG_SERVER_NOT_FIND.getCode(), "您还未接入短信运营商,请联系平台管理员");
wxMsgConfig = wxMsgConfigs.get(0);

String secret = wxMsgConfig.getSecret();
@@ -56,12 +57,12 @@ public class WxMsgModelServiceImpl implements WxMsgModelService {
//查看用户最新数据是否存在
List<WxMsgModel> wxMsgModels = wxMsgModelMapper.findList(wxMsgModel);
if (wxMsgModel.getId() == null && wxMsgModels.size() == 1) {
return new ResultData(Result.SUCCESS, "您添加的短信模板已存在");
return new ResultData(ErrorCode.MSG_TEMPLATE_REPEAT.getCode(), "您添加的短信模板已存在");
}
if (wxMsgModel.getId() != null && wxMsgModels.size() == 1) {
WxMsgModel wxmsgmodel = wxMsgModels.get(0);
if(wxmsgmodel.getContent().equals(wxMsgModel.getContent()) && wxmsgmodel.getSignature().equals(wxMsgModel.getSignature())) {
return new ResultData(Result.SUCCESS, "您添加的短信模板已存在");
return new ResultData(ErrorCode.MSG_TEMPLATE_REPEAT.getCode(), "您添加的短信模板已存在");
}
}

@@ -115,9 +116,9 @@ public class WxMsgModelServiceImpl implements WxMsgModelService {
}
return new ResultData(Result.SUCCESS, "创建模板成功");
}else if (ret == "-4") {
return new ResultData(Result.SUCCESS, "短信签名或内容错误");
return new ResultData(ErrorCode.MSG_SIGNATURE_CONTENT_ERROR.getCode(), "短信签名或内容错误");
}
return new ResultData(Result.SUCCESS, "创建模板失败");
return new ResultData(ErrorCode.MSG_TEMPLATE_CREATE_ERROR.getCode(), "创建模板失败");
}

@Override


+ 1
- 1
mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml Просмотреть файл

@@ -26,7 +26,7 @@
</if>
<if test=" null != tenantId ">
and `tenant_id` like concat('%', #{tenantId},'%')
and `tenant_id`=#{tenantId}
</if>


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