Просмотр исходного кода

[营销分析][添加][卡营销列表]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
73dc592c24
7 измененных файлов: 18 добавлений и 18 удалений
  1. +1
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  2. +1
    -0
      mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java
  3. +1
    -0
      mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java
  4. +0
    -4
      mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java
  5. +2
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  6. +9
    -11
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java
  7. +4
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java

+ 1
- 2
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java Просмотреть файл

@@ -103,8 +103,7 @@ public class WxCouponOrderController extends BaseController {
@ApiOperation(value = "核销接口", notes = "{\"couponOrderId\":\"string\"}") @ApiOperation(value = "核销接口", notes = "{\"couponOrderId\":\"string\"}")
@PostMapping("verify") @PostMapping("verify")
public ResultData verify(@RequestBody Map<String, String> paramMap) { public ResultData verify(@RequestBody Map<String, String> paramMap) {
logger.info("couponOrderController.verify");
logger.info(paramMap.toString());
logger.info("couponOrderController.verify:"+paramMap.toString());
String couponOrderIdStr = paramMap.get("couponOrderId"); String couponOrderIdStr = paramMap.get("couponOrderId");
if (StringUtils.isBlank(couponOrderIdStr)) { if (StringUtils.isBlank(couponOrderIdStr)) {
logger.error("couponOrderId不能为空: " + paramMap.toString()); logger.error("couponOrderId不能为空: " + paramMap.toString());


+ 1
- 0
mallinkMQConsumer/src/main/java/com/iformall/mq/MqBaseConsumer.java Просмотреть файл

@@ -56,6 +56,7 @@ public class MqBaseConsumer {
baseMsg.setMsgStatus(EnumMsgRecordStatus.CONSUME_SUCC.getCode()); baseMsg.setMsgStatus(EnumMsgRecordStatus.CONSUME_SUCC.getCode());
wxMsgRecordMapper.update(baseMsg); wxMsgRecordMapper.update(baseMsg);
}catch (Exception e){ }catch (Exception e){
//todo:测试下
if(null != baseMsg){ if(null != baseMsg){
if(baseMsg.getDelayTimeLevel() < 3){ if(baseMsg.getDelayTimeLevel() < 3){
baseMsg.setDelayTimeLevel(3); //10s后重试 baseMsg.setDelayTimeLevel(3); //10s后重试


+ 1
- 0
mallinkSchedule/src/main/java/com/iformall/schedule/MsgSendingSchedule.java Просмотреть файл

@@ -43,6 +43,7 @@ public class MsgSendingSchedule {
logger.info("sendmsg定时任务启动"); logger.info("sendmsg定时任务启动");
String systemTime = DateUtils.getSystemTime("yyyy-MM-dd HH:00:00"); String systemTime = DateUtils.getSystemTime("yyyy-MM-dd HH:00:00");
WxMsg wxMsg = new WxMsg(); WxMsg wxMsg = new WxMsg();
wxMsg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode());
wxMsg.setIsright(0); wxMsg.setIsright(0);
wxMsg.setSendtime(systemTime); wxMsg.setSendtime(systemTime);
List<WxMsg> list = wxMsgMapper.findList(wxMsg); List<WxMsg> list = wxMsgMapper.findList(wxMsg);


+ 0
- 4
mallinkService/src/main/java/com/iformall/mq/impl/RabbitMqMessageProducer.java Просмотреть файл

@@ -1,22 +1,18 @@
package com.iformall.mq.impl; package com.iformall.mq.impl;


import com.iformall.domain.po.BaseMsg; 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.enums.EnumMsgRecordStatus;
import com.iformall.mapper.WxMsgRecordMapper; import com.iformall.mapper.WxMsgRecordMapper;
import com.iformall.mq.MQConfig; import com.iformall.mq.MQConfig;
import com.iformall.mq.MqBaseProducer; import com.iformall.mq.MqBaseProducer;
import com.iformall.service.WxMsgRecordService; import com.iformall.service.WxMsgRecordService;
import com.iformall.utils.JsonUtil; import com.iformall.utils.JsonUtil;
import lombok.extern.slf4j.Slf4j;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.amqp.core.AmqpTemplate; import org.springframework.amqp.core.AmqpTemplate;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Profile; import org.springframework.context.annotation.Profile;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.UUID;


/** /**
* @Auther: Stormeye * @Auther: Stormeye


+ 2
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Просмотреть файл

@@ -585,6 +585,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
} }
//mq发送小程序消息 //mq发送小程序消息
smartAppMsg = new SmartAppMsg(); smartAppMsg = new SmartAppMsg();
smartAppMsg.setMsgType(EnumMsgRecordType.SMART_APP.getCode());
smartAppMsg.setAppId(user.getAppId()); smartAppMsg.setAppId(user.getAppId());
smartAppMsg.setTenantId(couponOrder.getTenantId()); smartAppMsg.setTenantId(couponOrder.getTenantId());
smartAppMsg.setTemplateType(EnumTemplateType.VERIFY_SUCCESS.getCode()); smartAppMsg.setTemplateType(EnumTemplateType.VERIFY_SUCCESS.getCode());
@@ -603,6 +604,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
} else { } else {
//mq发送小程序消息 //mq发送小程序消息
smartAppMsg = new SmartAppMsg(); smartAppMsg = new SmartAppMsg();
smartAppMsg.setMsgType(EnumMsgRecordType.SMART_APP.getCode());
smartAppMsg.setAppId(user.getAppId()); smartAppMsg.setAppId(user.getAppId());
smartAppMsg.setTenantId(couponOrder.getTenantId()); smartAppMsg.setTenantId(couponOrder.getTenantId());
smartAppMsg.setTemplateType(EnumTemplateType.VERIFY_FAIL.getCode()); smartAppMsg.setTemplateType(EnumTemplateType.VERIFY_FAIL.getCode());


+ 9
- 11
mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java Просмотреть файл

@@ -21,20 +21,18 @@ public class WxMsgRecordServiceImpl implements WxMsgRecordService {


@Override @Override
public void save(BaseMsg data) { public void save(BaseMsg data) {
WxMsgRecord msgRecord = new WxMsgRecord();
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();

if(data instanceof WxMsgRecord){ 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 @Override


+ 4
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java Просмотреть файл

@@ -114,6 +114,7 @@ public class WxMsgServiceImpl implements WxMsgService {
//sendmsg(wxMsg, wxMsgConfig, null); //sendmsg(wxMsg, wxMsgConfig, null);
wxMsg.setWxMsgConfig(wxMsgConfig); wxMsg.setWxMsgConfig(wxMsgConfig);
wxMsg.setCouponInject(null); wxMsg.setCouponInject(null);
wxMsg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode());
mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),null); mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),null);
} }
return new ResultData(Result.SUCCESS, "短信已发送"); return new ResultData(Result.SUCCESS, "短信已发送");
@@ -142,6 +143,7 @@ public class WxMsgServiceImpl implements WxMsgService {
} else { } else {
//sendmsg(wxMsg, wxMsgConfig, null); //sendmsg(wxMsg, wxMsgConfig, null);
wxMsg.setWxMsgConfig(wxMsgConfig); wxMsg.setWxMsgConfig(wxMsgConfig);
wxMsg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode());
mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode());
} }
return new ResultData(Result.SUCCESS, "短信已发送"); return new ResultData(Result.SUCCESS, "短信已发送");
@@ -155,7 +157,6 @@ public class WxMsgServiceImpl implements WxMsgService {
} }
} }



@Override @Override
public void deleteById(Long id) { public void deleteById(Long id) {
wxMsgMapper.deleteByPrimaryKey(id); wxMsgMapper.deleteByPrimaryKey(id);
@@ -184,6 +185,7 @@ public class WxMsgServiceImpl implements WxMsgService {
//sendmsg(wxMsg, wxMsgConfig, couponInject); //sendmsg(wxMsg, wxMsgConfig, couponInject);
wxMsg.setWxMsgConfig(wxMsgConfig); wxMsg.setWxMsgConfig(wxMsgConfig);
wxMsg.setCouponInject(couponInject); wxMsg.setCouponInject(couponInject);
wxMsg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode());
mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode());
} else { } else {
List<String> phoneList = Arrays.asList(split).subList(i * 1000, (i + 1) * 1000); List<String> phoneList = Arrays.asList(split).subList(i * 1000, (i + 1) * 1000);
@@ -193,6 +195,7 @@ public class WxMsgServiceImpl implements WxMsgService {
//sendmsg(wxMsg, wxMsgConfig, couponInject); //sendmsg(wxMsg, wxMsgConfig, couponInject);
wxMsg.setWxMsgConfig(wxMsgConfig); wxMsg.setWxMsgConfig(wxMsgConfig);
wxMsg.setCouponInject(couponInject); wxMsg.setCouponInject(couponInject);
wxMsg.setMsgType(EnumMsgRecordType.SMS_CALLBACK.getCode());
mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode()); mqBaseProducer.sendMessage(wxMsg, EnumMsgMqTopic.DEFAULT.getCode(),EnumMsgMqTag.DEFAULT.getCode(),EnumMsgMqKey.DEFAULT.getCode());
} }
} }


Загрузка…
Отмена
Сохранить