Merge remote-tracking branch 'origin/master'

doum

12 小时以前 e68e324f91d1a4eb2d4c5f07d27ca105a308bc0c

 server/dmmall_web/src/main/java/com/doumee/api/web/mall/GoodsApi.java

@@ -27,7 +27,8 @@
@RequestMapping("/web/goods")
@Slf4j
public class GoodsApi extends ApiController {
//    @LoginRequired


    @ApiOperation("商品列表")
    @PostMapping("/goodsPage")
    @ApiImplicitParams({
@@ -38,15 +39,15 @@
        return ApiResponse.success("查询成功",page);
    }

//    @LoginRequired
    @ApiOperation("商品详情")
    @GetMapping("/goodsInfo")
    @ApiImplicitParams({
            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "用户token值", required = true),
            @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) {
        GoodsInfoResponse goodsInfoResponse = goodsService.getGoodsInfo(goodsId);
    public ApiResponse<GoodsInfoResponse> goodsInfo(@RequestParam Integer goodsId,Integer memberId) {
        GoodsInfoResponse goodsInfoResponse = goodsService.getGoodsInfo(goodsId,memberId);
        return ApiResponse.success("查询成功",goodsInfoResponse);
    }