From 43d605c9eb708326cf229942bc0117cb8accd1c7 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期日, 12 四月 2026 16:19:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0' into 1.0
---
xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCollectAddrController.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCollectAddrController.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCollectAddrController.java
index 9868eae..4da6183 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCollectAddrController.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/controller/XpAppUserCollectAddrController.java
@@ -1,20 +1,21 @@
package com.xiaopeng.account.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.xiaopeng.account.model.dto.CollectAddrDTO;
import com.xiaopeng.account.model.query.XpUserCollectAddrListQuery;
import com.xiaopeng.account.model.vo.XpAppUserCollectAddrVO;
import com.xiaopeng.account.service.IXpAppUserCollectAddrService;
+import com.xiaopeng.api.model.account.XpAppUserCollectAddr;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.web.page.PageInfo;
import com.xiaopeng.unifiedverification.interceptor.XpClientCheck;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -66,6 +67,36 @@
+ /**
+ * 1.0删除收藏夹数据
+ */
+ @DeleteMapping("/api/v1/mini-program/collect/delete/{id}")
+ @ApiOperation(value = "删除收藏夹数据", tags = {"小程序-删除收藏夹数据"})
+ @XpClientCheck(checkToken = false, checkOtpToken = true)
+ public R<String> delete(@PathVariable Long id, HttpServletRequest request) {
+ // uid已通过拦截器otp校验，可以直接使用
+ String uid = request.getHeader("XP-Uid");
+ XpAppUserCollectAddr address = xpAppUserCollectAddrService.getById(id);
+ if (address == null || !address.getAppUserId().equals(Long.valueOf(uid))) {
+ return R.fail("收藏夹数据不存在");
+ }
+ boolean result = xpAppUserCollectAddrService.removeById(id);
+ if (result) {
+ return R.ok();
+ }
+ return R.fail();
+ }
+ /**
+ * 获取用户收藏的pointIds
+ * @param uid
+ * @return
+ */
+ @GetMapping("/logan/rt/v1/appUser/collectAddr/getPointIds")
+ public R<List<Long>> getPointIdsByUserId(@RequestParam Long uid){
+ List<Long> ids = xpAppUserCollectAddrService.list(new LambdaQueryWrapper<XpAppUserCollectAddr>().eq(XpAppUserCollectAddr::getAppUserId, uid)).stream().map(XpAppUserCollectAddr::getPointId).collect(Collectors.toList());
+ return R.ok(ids);
+ }
+
}
--
Gitblit v1.7.1