From 526f6faf4baefd60cd2adc5997069adec9ba10d4 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Wed, 9 Jan 2019 14:29:59 +0800 Subject: [PATCH] =?UTF-8?q?[BUG][1000780]:=E4=BA=91=E7=AB=AF=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=20version:.434.561=EF=BC=9A=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=B2=A1=E6=9C=89=E5=9B=9E=E8=B0=83=E5=87=BA?= =?UTF-8?q?=E5=8F=91=E9=80=81=E7=BB=93=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/iformall/enums/EnumMsgSendStatus.java | 1 + .../com/iformall/service/impl/WxMsgCallbackServiceImpl.java | 6 +++++- .../java/com/iformall/service/impl/WxMsgServiceImpl.java | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumMsgSendStatus.java b/mallinkService/src/main/java/com/iformall/enums/EnumMsgSendStatus.java index 5008a1c88..4bec81de7 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumMsgSendStatus.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumMsgSendStatus.java @@ -4,6 +4,7 @@ package com.iformall.enums; * Created by Stormeye on 2018/08/09. */ public enum EnumMsgSendStatus { + MSG_SENDING(2, "发送中"), MSG_SEND_SUCCESS(1,"发送成功"), MSG_SEND_FAIL(0,"发送失败") ; 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 2608a5298..fa73fa083 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java @@ -83,7 +83,11 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { if(callback!=null){//有更新,无插入 callback.setSign(param.get("sign")); callback.setTenantId(tenantId); - callback.setStatus(wxMsgCallback.getStatus()); + if (!wxMsgCallback.getStatus().equals(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode())) { + callback.setStatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode()); + } else { + callback.setStatus(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode()); + } callback.setStatusMsg(wxMsgCallback.getStatusMsg()); callback.setBegintime(wxMsgCallback.getBegintime()); callback.setEndtime(wxMsgCallback.getEndtime()); 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 e361bd042..352e4b308 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -262,7 +262,8 @@ public class WxMsgServiceImpl implements WxMsgService { wxMsgCallback.setTenantId(wxmsg.getTenantId()); wxMsgCallback.setBatchNo(batchNo); wxMsgCallback.setMsgId(wxmsg.getId()); - wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode()); + wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SENDING.getCode()); + wxMsgCallback.setStatusMsg(EnumMsgSendStatus.MSG_SENDING.getMessage()); wxMsgCallback.setCreatetime(new Date()); wxMsgCallbackMapper.insertSelective(wxMsgCallback); }