From 0a206f3acb9af0ec9db650861d34a256cda1c960 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 26 二月 2026 17:48:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_web/src/main/java/com/doumee/api/web/CollectApi.java | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/CollectApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/CollectApi.java
index 5cbd493..d06d2ac 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/CollectApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/CollectApi.java
@@ -1,10 +1,17 @@
package com.doumee.api.web;
import com.doumee.config.annotation.LoginRequired;
+import com.doumee.config.annotation.LoginShopRequired;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.PageData;
+import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Collect;
+import com.doumee.dao.business.model.Goodsorder;
import com.doumee.dao.web.request.CollectSaveRequest;
+import com.doumee.dao.web.request.ShopOrderRequest;
+import com.doumee.dao.web.response.CollectResponse;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -56,15 +63,24 @@
@LoginRequired
@ApiOperation("鎴戠殑鏀惰棌")
- @GetMapping("/myCollectList")
+ @PostMapping("/myCollectPage")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
- public ApiResponse myCollectList(@RequestParam Integer type) {
- return ApiResponse.success(collectService.myCollect(getMemberId(),type));
+ public ApiResponse<PageData<Collect>> myCollectPage(@RequestBody PageWrap<Collect> pageWrap) {
+ PageData<Collect> page = collectService.myCollectPage(pageWrap,getMemberId());
+ return ApiResponse.success("鏌ヨ鎴愬姛",page);
}
-
+ @LoginRequired
+ @ApiOperation("鎴戠殑鏀惰棌鏁伴噺")
+ @GetMapping("/getCollectNum")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+ })
+ public ApiResponse<CollectResponse> getCollectNum() {
+ return ApiResponse.success("鏌ヨ鎴愬姛",collectService.getCollectNum(getMemberId()));
+ }
}
--
Gitblit v1.9.3