Merge remote-tracking branch 'origin/master'

doum

2 天以前 80d88f15a2222ec2dbe33f5d1d2b2296a890f41b

 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()));
    }