From 2cb2c48e87f754236cc906c4db97e9d84be19d46 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 18 四月 2026 15:23:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0

---
 xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java
index ac5d93d..d2df9a8 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpActicityController.java
@@ -1,9 +1,17 @@
 package com.xiaopeng.operation.controller;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.xiaopeng.common.core.domain.R;
+import com.xiaopeng.operation.service.IXpActicityService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
-import org.springframework.stereotype.Controller;
+import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * <p>
@@ -13,8 +21,24 @@
  * @author mitao
  * @since 2026-02-03
  */
-@Controller
-@RequestMapping("/xp-acticity")
+@Api(tags = "活动管理")
+@RequiredArgsConstructor(onConstructor_ = @Lazy)
 public class XpActicityController {
 
+    @Resource
+    private IXpActicityService xpActicityService;
+
+
+    /**
+     * 获取所有白名单手机号
+     * @return
+     */
+    @PostMapping("/logan/inner/acticity/findListToIds")
+    @ApiOperation(value = "获取活动信息ids", tags = {"管理后台-获取活动信息ids"})
+    public R<List<String>> findListToIds(@RequestParam String acticityName){
+        if(acticityName == null){
+            return R.ok();
+        }
+        return R.ok(xpActicityService.findListToIds(acticityName));
+    }
 }

--
Gitblit v1.7.1