Merge remote-tracking branch 'origin/dev' into dev

jiaosong

2023-09-14 4dadac0d032c1b2543ff9bd7251d73a90f8e3b11

 server/company/src/main/java/com/doumee/api/business/GoodsController.java

@@ -3,9 +3,12 @@
import com.doumee.api.BaseController;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.dao.business.model.Goods;
import com.doumee.dao.business.model.dto.BatchDisableDTO;
import com.doumee.dao.business.model.dto.GoodCreatePlatRequest;
import com.doumee.dao.business.model.dto.GoodsRequest;
import com.doumee.service.business.GoodsService;
import io.swagger.annotations.*;
@@ -41,6 +44,24 @@
        return ApiResponse.success(goodsService.create(goods));
    }



    @PreventRepeat
    @ApiOperation("企业新建商品")
    @PostMapping("/companyCreate")
//    @RequiresPermissions("business:goods:create")
    public ApiResponse companyCreate(@RequestBody Goods goods) {
        return ApiResponse.success(goodsService.companyCreate(goods));
    }

    @PreventRepeat
    @ApiOperation("从平台选择商品")
    @PostMapping("/createPlat")
    @RequiresPermissions("business:goods:create")
    public ApiResponse createPlat(@RequestBody GoodCreatePlatRequest param) {
        return ApiResponse.success(goodsService.createPlat(param));
    }

    @ApiOperation("根据ID删除")
    @GetMapping("/delete/{id}")
    @RequiresPermissions("business:goods:delete")
@@ -70,10 +91,20 @@
        return ApiResponse.success(null);
    }

    @ApiOperation("企业根据ID修改")
    @PostMapping("/companyUpdateById")
    @RequiresPermissions("business:goods:update")
    public ApiResponse companyUpdateById(@RequestBody Goods goods) {
        goodsService.companyUpdateById(goods);
        return ApiResponse.success(null);
    }

    @ApiOperation("分页查询")
    @PostMapping("/page")
    @RequiresPermissions("business:goods:query")
    public ApiResponse<PageData<Goods>> findPage (@RequestBody PageWrap<Goods> pageWrap) {
        LoginUserInfo loginUserInfo = this.getLoginUser();
        pageWrap.getModel().setCompanyId(loginUserInfo.getCompanyId());
        return ApiResponse.success(goodsService.findPage(pageWrap));
    }

@@ -110,6 +141,13 @@
        return ApiResponse.success(null);
    }

    @ApiOperation("批量修改状态")
    @PostMapping("/batchUpdateDisableById")
    @RequiresPermissions("business:category:update")
    public ApiResponse<String> batchUpdateDisableById(@RequestBody BatchDisableDTO batchDisableDTO) {
        return ApiResponse.success(goodsService.batchUpdateDisableById(batchDisableDTO));
    }


    @ApiOperation("列表 - H5")
    @PostMapping("/list")