cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

处理 放开rocketMQ后mall和message模块循环依赖

Browse Source
This commit is contained in:
朱耘稷
2020-12-08 17:39:12 +08:00
parent 3266999397
commit 2703b35fcb
4 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
yshop-common/src/main/java/co/yixiang/event/TemplateListenEnum.java
View File

@ -19,8 +19,8 @@ public enum TemplateListenEnum {
TYPE_3("3","发货成功通知"),
TYPE_4("4","充值成功通知"),
TYPE_5("5","在线买单/收款成功通知"),
TYPE_6("6","商家收款通知");
TYPE_6("6","商家收款通知"),
TYPE_7("7","用户下单未支付通知");
private String value;
private String desc;

15
yshop-mall/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java
View File

@ -202,8 +202,6 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
@Autowired
private RedisUtils redisUtils;
//@Autowired
//private MqProducer mqProducer;
@Autowired
private RedisTemplate<String, String> redisTemplate;
@ -565,9 +563,6 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
OrderLogEnum.CREATE_ORDER.getDesc());
//使用MQ延时消息
//mqProducer.sendMsg("yshop-topic",storeOrder.getId().toString());
//log.info("投递延时订单id： [{}]：", storeOrder.getId());
//加入redis，30分钟自动取消
String redisKey = String.valueOf(StrUtil.format("{}{}",
@ -575,6 +570,16 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl<StoreOrderMapper, Y
redisTemplate.opsForValue().set(redisKey, storeOrder.getOrderId() ,
ShopConstants.ORDER_OUTTIME_UNPAY, TimeUnit.MINUTES);
//使用MQ延时消息
// TemplateBean templateBean = TemplateBean.builder()
// .orderId(storeOrder.getId()+"")
// .uid(storeOrder.getUid())
// .templateType(TemplateListenEnum.TYPE_7.getValue())
// .time(DateUtil.formatTime(new Date()))
// .build();
// publisher.publishEvent(new TemplateEvent(this,templateBean));
return storeOrder;
}

13
yshop-weixin/pom.xml
View File

@ -18,6 +18,19 @@
<artifactId>yshop-mall</artifactId>
<version>3.1</version>
</dependency>
<dependency>
<groupId>co.yixiang</groupId>
<artifactId>yshop-message</artifactId>
<version>3.1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
<groupId>co.yixiang</groupId>
<artifactId>yshop-mall</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>

8
yshop-weixin/src/main/java/co/yixiang/modules/mp/listener/TemplateListener.java
View File

@ -13,6 +13,7 @@ import co.yixiang.enums.PayTypeEnum;
import co.yixiang.event.TemplateBean;
import co.yixiang.event.TemplateEvent;
import co.yixiang.event.TemplateListenEnum;
import co.yixiang.message.rocketmq.MqProducer;
import co.yixiang.modules.mp.service.WeiXinSubscribeService;
import co.yixiang.modules.mp.service.WeixinPayService;
import co.yixiang.modules.mp.service.WeixinTemplateService;
@ -39,6 +40,8 @@ public class TemplateListener implements SmartApplicationListener {
private WeixinPayService weixinPayService;
@Autowired
private WeiXinSubscribeService weiXinSubscribeService;
//@Autowired
//private MqProducer mqProducer;
@Override
public boolean supportsEventType(Class<? extends ApplicationEvent> aClass) {
@ -79,6 +82,11 @@ public class TemplateListener implements SmartApplicationListener {
weixinTemplateService.rechargeSuccessNotice(templateBean.getTime(),templateBean.getPrice(),
templateBean.getUid());
break;
case TYPE_7:
//使用MQ延时消息
//mqProducer.sendMsg("yshop-topic", templateBean.getOrderId());
log.info("投递延时订单id： [{}]：", templateBean.getOrderId());
break;
default:
//todo
}