From f42aa168c8e882f8a6cde55f82b38360fd229e09 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 5 Sep 2018 11:48:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=A0=87=E7=AD=BE=E7=9F=AD=E4=BF=A1][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9]=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=81=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxMsgModelController.java | 1 + .../src/main/java/com/simple/common/ErrorCode.java | 14 ++++++++++++-- .../simple/service/impl/WxMsgModelServiceImpl.java | 11 ++++++----- .../src/main/resources/mapper/WxMsgModelMapper.xml | 2 +- 4 files changed, 20 insertions(+), 8 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java index a7e93122e..37c5520cd 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxMsgModelController.java +++ b/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 page = wxMsgModelService.listAsPage(wxMsgModel, pageNum, pageSize); return new ResultData(page); } diff --git a/mallinkService/src/main/java/com/simple/common/ErrorCode.java b/mallinkService/src/main/java/com/simple/common/ErrorCode.java index 27e15469b..83d3605d2 100644 --- a/mallinkService/src/main/java/com/simple/common/ErrorCode.java +++ b/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; diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java index 60b4837c0..448369d1a 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxMsgModelServiceImpl.java +++ b/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 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 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 diff --git a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml index e05d085df..77efab743 100644 --- a/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMsgModelMapper.xml @@ -26,7 +26,7 @@ - and `tenant_id` like concat('%', #{tenantId},'%') + and `tenant_id`=#{tenantId}