From a1629659a6d97d21b9f2c2c419c29344eb945499 Mon Sep 17 00:00:00 2001 From: luozukai Date: Mon, 25 Mar 2019 17:07:00 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=9F=AD=E4=BF=A1=E7=BB=84=E4=BB=B6][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9][=E4=BF=AE=E6=94=B9=E5=BB=B6=E8=BF=9F?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SendCallBackSmsServiceImpl.java | 44 +++++++------------ 1 file changed, 17 insertions(+), 27 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/SendCallBackSmsServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/SendCallBackSmsServiceImpl.java index d39769bc2..ccc37620c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/SendCallBackSmsServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/SendCallBackSmsServiceImpl.java @@ -90,38 +90,28 @@ public class SendCallBackSmsServiceImpl implements MsgSendService { record.setSendstatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode()); } - final IdWorker idWorker = IdWorker.get(); - long id = idWorker.nextId(); - WxMsg wxMsg = new WxMsg(); - wxMsg.setTenantId(record.getTenantId()); - wxMsg.setModelId(record.getModelId()); - wxMsg.setMsg(record.getMsg()); - wxMsg.setExpectSendNumber(record.getExpectSendNumber()); - wxMsg.setPhones(record.getPhones()); - wxMsg.setSignature(record.getSignature()); - wxMsg.setIsright(record.getIsright()); - wxMsg.setName(record.getName()); - wxMsg.setSendstatus(record.getSendstatus()); - wxMsg.setLabel(record.getLabel()); - wxMsg.setStatus(record.getStatus()); - wxMsg.setWay(record.getWay()); - wxMsg.setId(id); - String systemTime = DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss"); - wxMsg.setSendtime(systemTime); - wxMsg.setCreatetime(DateUtils.stringToDate(systemTime, "yyyy-MM-dd HH:mm:ss")); - //精准投放 - if (couponInject != null) { - wxMsg.setCouponInjectId(couponInject.getId()); + if(record.getId() == null){ + final IdWorker idWorker = IdWorker.get(); + long id = idWorker.nextId(); + record.setId(id); + String systemTime = DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss"); + record.setSendtime(systemTime); + record.setCreatetime(DateUtils.stringToDate(systemTime, "yyyy-MM-dd HH:mm:ss")); + //精准投放 + if (couponInject != null) { + record.setCouponInjectId(couponInject.getId()); + } + wxMsgMapper.insertSelective(record); } - wxMsgMapper.insertSelective(wxMsg); + if (ret.equals(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode().toString())) { - wxMsgService.addMsgCallback(wxMsg, batchNo); + wxMsgService.addMsgCallback(record, batchNo); //wx_msg改为已发送 - wxMsg.setStatus(EnumMsgStatus.MSG_STATUS_SENDED.getCode()); - wxMsgMapper.updateByPrimaryKeySelective(wxMsg); + record.setStatus(EnumMsgStatus.MSG_STATUS_SENDED.getCode()); + wxMsgMapper.updateByPrimaryKeySelective(record); } else { logger.error("发送:{},运营商返回失败:{}",phone,result); - wxMsgMapper.updateByPrimaryKeySelective(wxMsg); + wxMsgMapper.updateByPrimaryKeySelective(record); throw new MallinkException(1001,"运营商返回失败:"+result); } }