Merge remote-tracking branch 'origin/master'

doum

10 小时以前 0a206f3acb9af0ec9db650861d34a256cda1c960

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

}