From bb671486066976fa67477ed71d1d424a6ee4e012 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 四月 2026 21:51:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpActicityServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpActicityServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpActicityServiceImpl.java
index 6fbc0d8..66504ea 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpActicityServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpActicityServiceImpl.java
@@ -5,6 +5,7 @@
import com.xiaopeng.api.model.operation.XpActicityStrategy;
import com.xiaopeng.api.model.operation.XpActicityUser;
import com.xiaopeng.api.model.operation.XpActivity;
+import com.xiaopeng.api.model.operation.XpActivityNotice;
import com.xiaopeng.api.query.operation.XpActivityPageListQuery;
import com.xiaopeng.common.core.utils.bean.BeanUtils;
import com.xiaopeng.common.core.web.page.PageInfo;
@@ -13,6 +14,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.xiaopeng.operation.service.IXpActicityStrategyService;
import com.xiaopeng.operation.service.IXpActicityUserService;
+import com.xiaopeng.operation.service.IXpActivityNoticeService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -40,6 +42,9 @@
@Resource
private IXpActicityUserService userService;
+
+ @Resource
+ private IXpActivityNoticeService activityNotice;
@Override
public PageInfo<XpActivity> pageList(XpActivityPageListQuery query) {
@@ -80,9 +85,9 @@
List<XpActicityStrategy> strategy = dto.getStrategy();
List<XpActicityUser> activityUser = dto.getActivityUser();
+ XpActivityNotice notice = dto.getNotice();
strategy.forEach(e -> e.setActitcityId(activity.getId().intValue()));
strategyService.saveBatch(strategy);
-
Map<String, XpActicityStrategy> strategyMap = strategy.stream().collect(Collectors.toMap(
XpActicityStrategy::getName,
Function.identity()
@@ -91,7 +96,9 @@
item.setActitcityId(activity.getId().intValue());
item.setActitcityStrategeId(strategyMap.get(item.getStrategyName()).getId());
});
+ notice.setActivityId(activity.getId());
userService.saveBatch(activityUser);
+ activityNotice.save(notice);
}
@Override
--
Gitblit v1.7.1