Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi in...

liujie

2026-06-09 c96fbe6b0aeb413a17c429133ee6d81d138144b9

 xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/UserSubscribeMessageController.java

@@ -58,17 +58,19 @@
            return R.fail("获取openid失败：{}", userResourcesDto.getMsg());
        }
        ThirdInfoVo thirdInfoVo = userResourcesDto.getData();
        List<String> templateIds = vo.getTemplateIds();
        userSubscribeMessageService.remove(new LambdaQueryWrapper<UserSubscribeMessage>()
                .eq(UserSubscribeMessage::getUserId, uid).in(UserSubscribeMessage::getTemplateId, templateIds));
        for (String templateId : templateIds) {
            UserSubscribeMessage userSubscribeMessage = new UserSubscribeMessage();
            userSubscribeMessage.setUserId(Long.valueOf(uid));
            userSubscribeMessage.setTemplateId(templateId);
            userSubscribeMessage.setStatus(1);
            userSubscribeMessage.setOpenId(thirdInfoVo.getThirdId());
            userSubscribeMessage.setDeleted(false);
            userSubscribeMessageService.save(userSubscribeMessage);
        if(null != thirdInfoVo){
            List<String> templateIds = vo.getTemplateIds();
            userSubscribeMessageService.remove(new LambdaQueryWrapper<UserSubscribeMessage>()
                    .eq(UserSubscribeMessage::getUserId, uid).in(UserSubscribeMessage::getTemplateId, templateIds));
            for (String templateId : templateIds) {
                UserSubscribeMessage userSubscribeMessage = new UserSubscribeMessage();
                userSubscribeMessage.setUserId(Long.valueOf(uid));
                userSubscribeMessage.setTemplateId(templateId);
                userSubscribeMessage.setStatus(1);
                userSubscribeMessage.setOpenId(thirdInfoVo.getThirdId());
                userSubscribeMessage.setDeleted(false);
                userSubscribeMessageService.save(userSubscribeMessage);
            }
        }
        return R.ok();
    }