diff --git a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java index 3fc2163fa..877eb750f 100644 --- a/mallinkService/src/main/java/com/iformall/common/ErrorCode.java +++ b/mallinkService/src/main/java/com/iformall/common/ErrorCode.java @@ -205,6 +205,8 @@ public enum ErrorCode{ MSG_REQUEST_PARAMS_ERROR(12106,"参数错误"), MSG_SEND_ERROR(12107,"发送短信失败"), MSG_METHOD_REQUEST_ERROR(12108,"接口请求错误"), + MSG_PHONE_NOT_FOUND(12109,"请输入手机号"), + /** * 会员 diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgStatus.java new file mode 100644 index 000000000..d0ff9d18e --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgStatus.java @@ -0,0 +1,41 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumMsgStatus { + MSG_STATUS_DRAFT(2, "草稿"), + MSG_STATUS_NOT_SEND(0, "未发送"), + MSG_STATUS_SENDED(1, "已发送"), + MSG_SEND_STATUS_SET_TIME(0, "定时"), + MSG_SEND_IMMEDIATELY(1, "立即发送"), + MSG_SEND_NOT_IMMEDIATELY(0, "不立即发送"), + MSG_SEND_SUCCESS(1,"发送成功"), + MSG_SEND_FAIL(0,"发送失败") + ; + + public static EnumMsgStatus getEnum(Integer code) { + for (EnumMsgStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumMsgStatus(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} 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 300ea889b..1b2d75524 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -12,6 +12,7 @@ import com.iformall.domain.po.WxCUser; import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxMsg; import com.iformall.domain.po.WxMsgConfig; +import com.iformall.enums.EnumMsgStatus; import com.iformall.mapper.*; import com.iformall.service.WxCUserService; import com.iformall.service.WxCUserTagsService; @@ -23,6 +24,7 @@ import com.iformall.utils.RsaUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.beans.Encoder; import java.util.*; @Service @@ -66,7 +68,7 @@ public class WxMsgServiceImpl implements WxMsgService { } if(phones.equals("")){ - return new ResultData(Result.SUCCESS, "您需要添加要发送的手机号"); + return new ResultData(ErrorCode.MSG_PHONE_NOT_FOUND, "请输入手机号"); } if (wxMsg.getId() == null) { @@ -82,10 +84,10 @@ public class WxMsgServiceImpl implements WxMsgService { //是否立即发送 if (wxMsg.getIsright() == 1) { - wxMsg.setStatus(1); + wxMsg.setStatus(EnumMsgStatus.MSG_STATUS_SENDED.getCode()); sendmsg(wxMsg); } else { - wxMsg.setStatus(0); + wxMsg.setStatus(EnumMsgStatus.MSG_STATUS_NOT_SEND.getCode()); final IdWorker idWorker = IdWorker.get(); wxMsg.setId(idWorker.nextId()); wxMsg.setCreatetime(new Date()); @@ -102,11 +104,11 @@ public class WxMsgServiceImpl implements WxMsgService { //是否立即发送 if (wxMsg.getIsright() == 1) { - wxMsg.setStatus(1); + wxMsg.setStatus(EnumMsgStatus.MSG_STATUS_SENDED.getCode()); sendmsg(wxMsg); } else { //定时 - wxMsg.setStatus(0); + wxMsg.setStatus(EnumMsgStatus.MSG_STATUS_NOT_SEND.getCode()); wxMsgMapper.updateByPrimaryKeySelective(wxMsg); return new ResultData(Result.SUCCESS, "短信会在预设时间发送"); @@ -152,7 +154,7 @@ public class WxMsgServiceImpl implements WxMsgService { WxMsgConfig wxMsgConfig = new WxMsgConfig(); wxMsgConfig.setTenantId(wxMsg.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, "您还未接入短信运营商,请联系平台管理员"); wxMsgConfig = wxMsgConfigs.get(0); String secret = wxMsgConfig.getSecret(); @@ -201,9 +203,9 @@ public class WxMsgServiceImpl implements WxMsgService { String ret = jsonObjectResult.get("ret").toString(); if (ret.equals("1")) { - wxMsg.setSendstatus(1); + wxMsg.setSendstatus(EnumMsgStatus.MSG_SEND_SUCCESS.getCode()); } else { - wxMsg.setSendstatus(0); + wxMsg.setSendstatus(EnumMsgStatus.MSG_SEND_FAIL.getCode()); } if (wxMsg.getId() == null) {