From 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 03 三月 2026 16:22:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmmall_web/src/main/java/com/doumee/api/web/mall/GoodsApi.java | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/server/dmmall_web/src/main/java/com/doumee/api/web/mall/GoodsApi.java b/server/dmmall_web/src/main/java/com/doumee/api/web/mall/GoodsApi.java
index a98e452..4ac39ef 100644
--- a/server/dmmall_web/src/main/java/com/doumee/api/web/mall/GoodsApi.java
+++ b/server/dmmall_web/src/main/java/com/doumee/api/web/mall/GoodsApi.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.Goods;
import com.doumee.dao.business.model.SearchHistory;
import com.doumee.dao.web.request.goods.GoodsRequest;
import com.doumee.dao.web.response.goods.GoodsInfoResponse;
@@ -35,11 +36,8 @@
@ApiOperation("鍟嗗搧鍒楄〃")
@PostMapping("/goodsPage")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true)
- })
- public ApiResponse<IPage<GoodsInfoResponse>> goodsPage(@RequestBody PageWrap<GoodsRequest> pageWrap) {
- IPage<GoodsInfoResponse> page = goodsService.getGoodsPage(pageWrap);
+ public ApiResponse<IPage<Goods>> goodsPage(@RequestBody PageWrap<GoodsRequest> pageWrap) {
+ IPage<Goods> page = goodsService.getGoodsPage(pageWrap);
return ApiResponse.success("鏌ヨ鎴愬姛",page);
}
@@ -49,8 +47,8 @@
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "goodsId", value = "鍟嗗搧涓婚敭", required = true),
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "memberId", value = "鐢ㄦ埛涓婚敭", required = true),
})
- public ApiResponse<GoodsInfoResponse> goodsInfo(@RequestParam Integer goodsId,Integer memberId) {
- GoodsInfoResponse goodsInfoResponse = goodsService.getGoodsInfo(goodsId,memberId);
+ public ApiResponse<Goods> goodsInfo(@RequestParam Integer goodsId,Integer memberId) {
+ Goods goodsInfoResponse = goodsService.getGoodsInfo(goodsId,memberId);
return ApiResponse.success("鏌ヨ鎴愬姛",goodsInfoResponse);
}
@@ -72,7 +70,7 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
})
- public ApiResponse<List<SearchHistory>> searchHistoryList(@RequestParam Integer type) {
+ public ApiResponse<List<SearchHistory>> searchHistoryList() {
return ApiResponse.success(searchHistoryService.findListByType(Constants.ZERO,getMemberId()));
}
--
Gitblit v1.9.3