diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgSend.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgSend.java new file mode 100644 index 000000000..f3f443731 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgSend.java @@ -0,0 +1,36 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumMsgSend { + MSG_SEND_IMMEDIATELY(1, "立即发送"), + MSG_SEND_NOT_IMMEDIATELY(0, "不立即发送") + + ; + + public static EnumMsgSend getEnum(Integer code) { + for (EnumMsgSend value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumMsgSend(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/enums/EnumMsgSendSetTime.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgSendSetTime.java new file mode 100644 index 000000000..36c3eb10a --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgSendSetTime.java @@ -0,0 +1,34 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumMsgSendSetTime { + MSG_SEND_STATUS_SET_TIME(0, "定时") + ; + + public static EnumMsgSendSetTime getEnum(Integer code) { + for (EnumMsgSendSetTime value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumMsgSendSetTime(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/enums/EnumMsgSendStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgSendStatus.java new file mode 100644 index 000000000..5008a1c88 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgSendStatus.java @@ -0,0 +1,35 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumMsgSendStatus { + MSG_SEND_SUCCESS(1,"发送成功"), + MSG_SEND_FAIL(0,"发送失败") + ; + + public static EnumMsgSendStatus getEnum(Integer code) { + for (EnumMsgSendStatus value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumMsgSendStatus(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/enums/EnumMsgStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgStatus.java index d0ff9d18e..a6b0d941e 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgStatus.java @@ -6,12 +6,7 @@ package com.iformall.enums; 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,"发送失败") + MSG_STATUS_SENDED(1, "已发送") ; public static EnumMsgStatus getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java index 547de7860..e37003494 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/CouponInjectServiceImpl.java @@ -181,11 +181,11 @@ public class CouponInjectServiceImpl implements CouponInjectService { return; } if(record.getSendType().equals(EnumCouponInjectSendType.TIMING.getCode())){ - wxmsg.setIsright(EnumMsgStatus.MSG_SEND_NOT_IMMEDIATELY.getCode());//值是相反的 + wxmsg.setIsright(EnumMsgSend.MSG_SEND_NOT_IMMEDIATELY.getCode());//值是相反的 wxmsg.setSendtime(DateUtils.date2String(record.getSendTime(),"yyyy-MM-dd HH:mm:ss")); wxmsg.setStatus(EnumMsgStatus.MSG_STATUS_NOT_SEND.getCode()); }else{ - wxmsg.setIsright(EnumMsgStatus.MSG_SEND_IMMEDIATELY.getCode());//立即发送 + wxmsg.setIsright(EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode());//立即发送 wxmsg.setStatus(EnumMsgStatus.MSG_STATUS_SENDED.getCode()); wxmsg.setSendtime(com.iformall.utils.DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss")); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java index d10b73e29..e9884cbcd 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java @@ -8,6 +8,7 @@ import com.iformall.domain.po.WxMsgCallback; import com.iformall.domain.po.WxMsgConfig; import com.iformall.domain.po.WxMsgModel; import com.iformall.domain.po.WxMsgValidationcodeModel; +import com.iformall.enums.EnumMsgSendStatus; import com.iformall.enums.EnumMsgStatus; import com.iformall.mapper.*; import com.iformall.service.WxMsgCallbackService; @@ -94,7 +95,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { wxMsgCallback.setId(idWorker.nextId()); wxMsgCallback.setCallbackId(callbackId); wxMsgCallback.setTenantId(tenantId); - wxMsgCallback.setStatus(EnumMsgStatus.MSG_SEND_FAIL.getCode()); + wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode()); wxMsgCallback.setCreatetime(new Date()); wxMsgCallbackMapper.insertSelective(wxMsgCallback); } 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 ac451b009..425299092 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -11,6 +11,7 @@ import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxMsg; import com.iformall.domain.po.WxMsgCallback; import com.iformall.domain.po.WxMsgConfig; +import com.iformall.enums.EnumMsgSendStatus; import com.iformall.enums.EnumMsgStatus; import com.iformall.mapper.WxCUserBasicInfoMapper; import com.iformall.mapper.WxMsgCallbackMapper; @@ -280,9 +281,9 @@ public class WxMsgServiceImpl implements WxMsgService { String ret = jsonObjectResult.get("ret").toString(); String batchNo = jsonObjectResult.get("data").toString(); if (ret.equals("1")) { - wxMsg.setSendstatus(EnumMsgStatus.MSG_SEND_SUCCESS.getCode()); + wxMsg.setSendstatus(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode()); } else { - wxMsg.setSendstatus(EnumMsgStatus.MSG_SEND_FAIL.getCode()); + wxMsg.setSendstatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode()); } final IdWorker idWorker = IdWorker.get(); @@ -318,7 +319,7 @@ public class WxMsgServiceImpl implements WxMsgService { wxMsgCallback.setTenantId(wxmsg.getTenantId()); wxMsgCallback.setBatchNo(batchNo); wxMsgCallback.setMsgId(wxmsg.getId()); - wxMsgCallback.setStatus(EnumMsgStatus.MSG_SEND_FAIL.getCode()); + wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode()); wxMsgCallback.setCreatetime(new Date()); wxMsgCallbackMapper.insertSelective(wxMsgCallback); }