Skip to content

张云鹏 / uc-consumer

Go to a project
Toggle navigation
Toggle navigation pinning
Commit 5b14169d 5b14169d3d8e9005194723bacfee554482a85b03 by xianghan
Options

1.兼容历史数据中无unionid和memberid的情况

1 parent 007294e7
Inline Side-by-side
Showing 4 changed files with 43 additions and 18 deletions
......@@ -27,6 +27,7 @@ import java.sql.Timestamp;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
import java.util.Objects;
/**
* @author XiangHan
......@@ -93,12 +94,20 @@ public class UserWeixinServiceImpl implements UserWeixinService {
String appid = resources.getAppid();
String openid = resources.getOpenid();
UserWeixin userWeixin = UserWeixinRepository.findFirstByAppidAndOpenid(appid,openid).orElseGet(UserWeixin::new);
ValidationUtil.isNull( userWeixin.getId(),"UserWeixin","id",resources.getId());
resources.setId(userWeixin.getId());
resources.setMemberId(userWeixin.getMemberId());
BeanUtils.copyProperties(resources,userWeixin);
log.info("update ==>>userWeixin ==>> resources ==>> [{}]",resources);
UserWeixinRepository.save(resources);
if (Objects.isNull(userWeixin.getId())) {
this.create(resources);
} else {
if (Objects.isNull(userWeixin.getMemberId())) {
String memberCode = resources.getMemberCode();
MemberDTO memberDTO = this.memberService.getByCode(memberCode);
resources.setMemberId(memberDTO.getId());
}
resources.setId(userWeixin.getId());
BeanUtils.copyProperties(resources,userWeixin);
log.info("update ==>>userWeixin ==>> resources ==>> [{}]",resources);
UserWeixinRepository.save(resources);
}
}
@Override
......
......@@ -28,11 +28,11 @@ public class UcGatewayEventConsumer {
* @author Hongyan Wang
* @date 2021/9/7 11:26 上午
*/
@RabbitHandler
/*@RabbitHandler
@RabbitListener(bindings = {
@QueueBinding(value = @Queue(value = RabbitMqConfig.UC_ROUTE_KEY_DIRECT_EVENT_AAA),
exchange = @Exchange(value = ExchangeTypes.DIRECT))
}, containerFactory = "managementRabbitListenerContainerFactory")
}, containerFactory = "managementRabbitListenerContainerFactory")*/
public void ucEventConsumer(String content) {
log.info(" receive dataSync msg , content is : {} ", content);
DataSyncMsg dataSyncMsg = this.parseContent(content);
......
......@@ -32,11 +32,11 @@ public class WeiXinEventConsumer {
* @description 删除用户收藏记录
* @param content 消息内容
*/
@RabbitHandler
/*@RabbitHandler
@RabbitListener(bindings = {
@QueueBinding(value = @Queue(value = RabbitMqConfig.COLLECTION_DELETE_QUEUE),
exchange = @Exchange(value = ExchangeTypes.DIRECT))},
containerFactory = "managementRabbitListenerContainerFactory")
containerFactory = "managementRabbitListenerContainerFactory")*/
public void deleteCollection(String content) {
try {
log.info("receive UserCollection delete message, content {}", content);
......@@ -50,11 +50,11 @@ public class WeiXinEventConsumer {
* @description 删除全部收藏记录
* @param content 消息内容
*/
@RabbitHandler
/*@RabbitHandler
@RabbitListener(bindings = {
@QueueBinding(value = @Queue(value = RabbitMqConfig.COLLECTION_DELETE_ALL_QUEUE),
exchange = @Exchange(value = ExchangeTypes.DIRECT))},
containerFactory = "managementRabbitListenerContainerFactory")
containerFactory = "managementRabbitListenerContainerFactory")*/
@Transactional
public void deleteAllCollection(String content) {
try {
......@@ -70,11 +70,11 @@ public class WeiXinEventConsumer {
* @param content 消息内容
* @description 获取公众号带参二维码
*/
@RabbitHandler
/*@RabbitHandler
@RabbitListener(bindings = {
@QueueBinding(value = @Queue(value = RabbitMqConfig.GET_QR_CODE_QUEUE),
exchange = @Exchange(value = ExchangeTypes.DIRECT))},
containerFactory = "managementRabbitListenerContainerFactory")
containerFactory = "managementRabbitListenerContainerFactory")*/
public void getQrCode(String content) {
try {
log.info("receive get qrCode message, content {}", content);
......@@ -130,11 +130,11 @@ public class WeiXinEventConsumer {
* }
* @param content
*/
@RabbitHandler
/*@RabbitHandler
@RabbitListener(bindings = {
@QueueBinding(value = @Queue(value = RabbitMqConfig.WEIXIN_SUBORUNSUB_QUEUE),
exchange = @Exchange(value = ExchangeTypes.DIRECT))},
containerFactory = "managementRabbitListenerContainerFactory")
containerFactory = "managementRabbitListenerContainerFactory")*/
@Transactional
public void subOrUnSubEvent(String content) {
try {
......@@ -177,11 +177,11 @@ public class WeiXinEventConsumer {
* @description 添加收藏记录
* @param content 消息内容
*/
@RabbitHandler
/* @RabbitHandler
@RabbitListener(bindings = {
@QueueBinding(value = @Queue(value = RabbitMqConfig.COLLECTION_ADD_QUEUE),
exchange = @Exchange(value = ExchangeTypes.DIRECT))},
containerFactory = "managementRabbitListenerContainerFactory")
containerFactory = "managementRabbitListenerContainerFactory")*/
@Transactional
public void addCollection(String content) {
try {
......
<?xml version="1.0" encoding="UTF-8"?>
<!--
This is the JRebel configuration file. It maps the running application to your IDE workspace, enabling JRebel reloading for this project.
Refer to https://manuals.jrebel.com/jrebel/standalone/config.html for more information.
-->
<application generated-by="intellij" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.zeroturnaround.com" xsi:schemaLocation="http://www.zeroturnaround.com http://update.zeroturnaround.com/jrebel/rebel-2_3.xsd">
<id>member-engine</id>
<classpath>
<dir name="D:/HanXi/work space/taojinglihua/member-engine/target/classes">
</dir>
</classpath>
</application>