diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java index 66aeeaa4b..6ce0fdbae 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java @@ -103,8 +103,7 @@ public class WxCouponOrderController extends BaseController { @ApiOperation(value = "核销接口", notes = "{\"couponOrderId\":\"string\"}") @PostMapping("verify") public ResultData verify(@RequestBody Map paramMap) { - logger.info("couponOrderController.verify"); - logger.info(paramMap.toString()); + logger.info("couponOrderController.verify:"+paramMap.toString()); String couponOrderIdStr = paramMap.get("couponOrderId"); if (StringUtils.isBlank(couponOrderIdStr)) { logger.error("couponOrderId不能为空: " + paramMap.toString()); diff --git a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java index 7e0d5495a..884066d14 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java @@ -56,6 +56,7 @@ public class MqBaseConsumer { baseMsg.setMsgStatus(EnumMsgRecordStatus.CONSUME_SUCC.getCode()); wxMsgRecordMapper.update(baseMsg); }catch (Exception e){ + //todo:测试下 if(null != baseMsg){ if(baseMsg.getDelayTimeLevel() < 3){ baseMsg.setDelayTimeLevel(3); //10s后重试 diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java index c6d3ac54a..661e88f8a 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java @@ -43,6 +43,7 @@ public class MsgSendingSchedule { logger.info("sendmsg定时任务启动"); String systemTime = DateUtils.getSystemTime("yyyy-MM-dd HH:00:00"); WxMsg wxMsg = new WxMsg(); + wxMsg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode()); wxMsg.setIsright(0); wxMsg.setSendtime(systemTime); List list = wxMsgMapper.findList(wxMsg); diff --git a/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java b/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java index ba9bd4874..948134008 100644 --- a/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java +++ b/mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java @@ -1,22 +1,18 @@ package com.iformall.mq.impl; import com.iformall.domain.po.BaseMsg; -import com.iformall.domain.po.WxMsg; -import com.iformall.domain.po.WxMsgRecord; import com.iformall.enums.EnumMsgRecordStatus; import com.iformall.mapper.WxMsgRecordMapper; import com.iformall.mq.MQConfig; import com.iformall.mq.MqBaseProducer; import com.iformall.service.WxMsgRecordService; import com.iformall.utils.JsonUtil; -import lombok.extern.slf4j.Slf4j; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.amqp.core.AmqpTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Profile; import org.springframework.stereotype.Service; -import java.util.UUID; /** * @Auther: Stormeye diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 3f1aa8c6c..0e997c455 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -585,6 +585,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } //mq发送小程序消息 smartAppMsg = new SmartAppMsg(); + smartAppMsg.setMsgType(EnumMsgRecordType.SMART_APP.getCode()); smartAppMsg.setAppId(user.getAppId()); smartAppMsg.setTenantId(couponOrder.getTenantId()); smartAppMsg.setTemplateType(EnumTemplateType.VERIFY_SUCCESS.getCode()); @@ -603,6 +604,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { } else { //mq发送小程序消息 smartAppMsg = new SmartAppMsg(); + smartAppMsg.setMsgType(EnumMsgRecordType.SMART_APP.getCode()); smartAppMsg.setAppId(user.getAppId()); smartAppMsg.setTenantId(couponOrder.getTenantId()); smartAppMsg.setTemplateType(EnumTemplateType.VERIFY_FAIL.getCode()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java index 806f22587..72e3f21e1 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java @@ -21,20 +21,18 @@ public class WxMsgRecordServiceImpl implements WxMsgRecordService { @Override public void save(BaseMsg data) { + WxMsgRecord msgRecord = new WxMsgRecord(); final IdWorker idWorker = IdWorker.get(); + if(data instanceof WxMsgRecord){ - WxMsgRecord msgRecord = (WxMsgRecord)data; - msgRecord.setUuid(UUID.randomUUID().toString()); - msgRecord.setMsgJson(JsonUtil.obj2Json(data)); - msgRecord.setId(idWorker.nextId()); - wxMsgRecordMapper.save(msgRecord); - }else if(data instanceof WxMsg || data instanceof MailMsg){ - WxMsgRecord msgRecord = new WxMsgRecord(); - msgRecord.setUuid(UUID.randomUUID().toString()); - msgRecord.setMsgJson(JsonUtil.obj2Json(data)); - msgRecord.setId(idWorker.nextId()); - wxMsgRecordMapper.save(msgRecord); + msgRecord = (WxMsgRecord)data; } + + msgRecord.setMsgType(data.getMsgType()); + msgRecord.setUuid(UUID.randomUUID().toString()); + msgRecord.setMsgJson(JsonUtil.obj2Json(data)); + msgRecord.setId(idWorker.nextId()); + wxMsgRecordMapper.save(msgRecord); } @Override 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 158d6142b..851674853 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java @@ -114,6 +114,7 @@ public class WxMsgServiceImpl implements WxMsgService { //sendmsg(wxMsg, wxMsgConfig, null); wxMsg.setWxMsgConfig(wxMsgConfig); wxMsg.setCouponInject(null); + wxMsg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode()); mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),null); } return new ResultData(Result.SUCCESS, "短信已发送"); @@ -142,6 +143,7 @@ public class WxMsgServiceImpl implements WxMsgService { } else { //sendmsg(wxMsg, wxMsgConfig, null); wxMsg.setWxMsgConfig(wxMsgConfig); + wxMsg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode()); mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); } return new ResultData(Result.SUCCESS, "短信已发送"); @@ -155,7 +157,6 @@ public class WxMsgServiceImpl implements WxMsgService { } } - @Override public void deleteById(Long id) { wxMsgMapper.deleteByPrimaryKey(id); @@ -184,6 +185,7 @@ public class WxMsgServiceImpl implements WxMsgService { //sendmsg(wxMsg, wxMsgConfig, couponInject); wxMsg.setWxMsgConfig(wxMsgConfig); wxMsg.setCouponInject(couponInject); + wxMsg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode()); mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); } else { List phoneList = Arrays.asList(split).subList(i * 1000, (i + 1) * 1000); @@ -193,6 +195,7 @@ public class WxMsgServiceImpl implements WxMsgService { //sendmsg(wxMsg, wxMsgConfig, couponInject); wxMsg.setWxMsgConfig(wxMsgConfig); wxMsg.setCouponInject(couponInject); + wxMsg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode()); mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); } }