From 7ea060d3acfdee74d24e2207e746c2061ee78a48 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 24 四月 2026 15:37:57 +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 | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 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 00f0d94..9c00a0a 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,6 +1,7 @@
package com.xiaopeng.operation.controller;
+import com.xiaopeng.api.dto.operation.XpActivityDto;
import com.xiaopeng.api.model.operation.XpActivity;
import com.xiaopeng.api.model.operation.XpCoupon;
import com.xiaopeng.api.query.operation.XpActivityPageListQuery;
@@ -13,6 +14,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
@@ -35,12 +37,12 @@
@Api(tags = "活动管理")
@RestController
@RequestMapping("")
+@Slf4j
@RequiredArgsConstructor(onConstructor_ = @Lazy)
public class XpActicityController {
@Resource
private IXpActicityService service;
-
/**
* 获取所有白名单手机号
@@ -93,28 +95,47 @@
@PostMapping("/v1/api/appUserCoupon/add")
@ApiOperation(value = "添加活动",tags = {"管理后台-活动管理"},response = XpCoupon.class)
- public R<?> add(@RequestBody XpActivity xpActivity){
- service.save(xpActivity);
+ public R<?> add(@RequestBody XpActivityDto dto){
+ service.save(dto);
return R.ok();
}
- @PostMapping("/v1/api/appUserCoupon/update")
- @ApiOperation(value = "修改活动",tags = {"管理后台-活动管理"},response = XpCoupon.class)
- public R<XpActivity> updateById(@RequestBody XpActivity xpActivity){
- service.updateById(xpActivity);
+ @PostMapping("/v1/api/appUserCoupon/{op}")
+ @ApiOperation(value = "修改活动状态,release,pause,resume,stop,del",tags = {"管理后台-活动管理"},response = XpCoupon.class)
+ public R<XpActivity> updateById(@PathVariable String op,@RequestParam Long id){
+
+ XpActivity activity = service.getById(id);
+ switch (op){
+ case "release":
+ activity.setStatus(2);
+ break;
+ case "pause":
+ activity.setStatus(4);
+ break;
+ case "resume":
+ activity.setStatus(1);
+ break;
+ case "stop":
+ activity.setStatus(3);
+ break;
+ case "del":
+ activity.setDeleted(true);
+ break;
+ default:
+ throw new UnsupportedOperationException("Unsupported" + op);
+ }
+ service.updateById(activity);
+ log.info("修改活动状态:{}",activity);
return R.ok();
}
- @GetMapping("/v1/api/appUserCoupon/update")
+ @GetMapping("/v1/api/appUserCoupon/detail")
@ApiOperation(value = "活动详情",tags = {"管理后台-活动管理"},response = XpCoupon.class)
- public R<XpActivity> queryById(@RequestBody XpActivity xpActivity){
+ public R<XpActivityDto> queryById(@RequestParam Long id){
- return R.ok(service.getById(xpActivity));
+ return R.ok(service.detail(id));
}
-
-
-
}
--
Gitblit v1.7.1