From f5560820431163db68ccea4c850fb90a0eebf467 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 20 四月 2026 21:42:17 +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 | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 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 daacfe5..fefa4a4 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
@@ -2,10 +2,13 @@
import com.xiaopeng.api.model.operation.XpActivity;
+import com.xiaopeng.api.model.operation.XpCoupon;
+import com.xiaopeng.api.query.operation.XpActivityPageListQuery;
import com.xiaopeng.api.vo.operation.XpActivityVo;
import com.xiaopeng.common.core.constant.CacheConstants;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.utils.bean.BeanUtils;
+import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.operation.service.IXpActicityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -13,7 +16,9 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import javax.annotation.Resource;
@@ -35,7 +40,7 @@
public class XpActicityController {
@Resource
- private IXpActicityService xpActicityService;
+ private IXpActicityService service;
/**
@@ -48,7 +53,7 @@
if(acticityName == null){
return R.ok();
}
- return R.ok(xpActicityService.findListToIds(acticityName));
+ return R.ok(service.findListToIds(acticityName));
}
@@ -66,7 +71,7 @@
String uid = request.getHeader("XP-Uid");
ValueOperations<String, String> ops = redisTemplate.opsForValue();
- XpActivity activity = xpActicityService.activiting();
+ XpActivity activity = service.activiting();
XpActivityVo ret = new XpActivityVo();
if (activity !=null) {
BeanUtils.copyBeanProp(ret, activity);
@@ -78,4 +83,39 @@
}
+
+ @PostMapping("/v1/api/appUserCoupon/pageList")
+ @ApiOperation(value = "活动列表",tags = {"管理后台-活动管理"},response = XpActivity.class)
+ public R<PageInfo<XpActivity>> pageList(@RequestBody XpActivityPageListQuery query) {
+ PageInfo<XpActivity> pageList = service.pageList(query);
+ return R.ok(pageList);
+ }
+
+
+ @PostMapping("/v1/api/xp-coupon/add")
+ @ApiOperation(value = "添加活动",tags = {"管理后台-活动管理"},response = XpCoupon.class)
+ public R<?> add(@RequestBody XpActivity xpActivity){
+ service.save(xpActivity);
+ return R.ok();
+ }
+
+
+ @PostMapping("/v1/api/xp-coupon/update")
+ @ApiOperation(value = "修改活动",tags = {"管理后台-活动管理"},response = XpCoupon.class)
+ public R<XpActivity> updateById(@RequestBody XpActivity xpActivity){
+ service.updateById(xpActivity);
+ return R.ok();
+ }
+
+ @GetMapping("/v1/api/xp-coupon/update")
+ @ApiOperation(value = "活动详情",tags = {"管理后台-活动管理"},response = XpCoupon.class)
+ public R<XpActivity> queryById(@RequestBody XpActivity xpActivity){
+
+ return R.ok(service.getById(xpActivity));
+ }
+
+
+
+
+
}
--
Gitblit v1.7.1