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

jiangping

2025-02-08 75ac3d5acdd448f063a3c307b4c733e37b4fc04f

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

@@ -3,14 +3,18 @@
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.CateParamSelectService;
import com.doumee.service.business.GoodsService;
import io.swagger.annotations.*;
import lombok.extern.java.Log;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -34,6 +38,8 @@

    @Autowired
    private GoodsService goodsService;
    @Autowired
    private CateParamSelectService cateParamSelectService;

    @PreventRepeat
    @ApiOperation("新建")
@@ -50,7 +56,9 @@
    @PostMapping("/companyCreate")
    @RequiresPermissions("business:goods:create")
    public ApiResponse companyCreate(@RequestBody Goods goods) {
        return ApiResponse.success(goodsService.companyCreate(goods));
        goodsService.companyCreate(goods);
        cateParamSelectService.dealCateParamSelect();
        return ApiResponse.success("操作成功");
    }

    @PreventRepeat
@@ -58,7 +66,10 @@
    @PostMapping("/createPlat")
    @RequiresPermissions("business:goods:create")
    public ApiResponse createPlat(@RequestBody GoodCreatePlatRequest param) {
        return ApiResponse.success(goodsService.createPlat(param));
        goodsService.openSyncSwitch();
        goodsService.createPlat(param);
//        cateParamSelectService.dealCateParamSelect();
        return ApiResponse.success("同步操作成功，请稍后刷新查看商品同步信息");
    }

    @ApiOperation("根据ID删除")
@@ -66,6 +77,7 @@
    @RequiresPermissions("business:goods:delete")
    public ApiResponse deleteById(@PathVariable Integer id) {
        goodsService.deleteById(id);
        cateParamSelectService.dealCateParamSelect();
        return ApiResponse.success(null);
    }

@@ -79,6 +91,7 @@
            idList.add(Integer.valueOf(id));
        }
        goodsService.deleteByIdInBatch(idList);
        cateParamSelectService.dealCateParamSelect();
        return ApiResponse.success(null);
    }

@@ -95,6 +108,7 @@
    @RequiresPermissions("business:goods:update")
    public ApiResponse companyUpdateById(@RequestBody Goods goods) {
        goodsService.companyUpdateById(goods);
        cateParamSelectService.dealCateParamSelect();
        return ApiResponse.success(null);
    }

@@ -102,6 +116,8 @@
    @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));
    }

@@ -124,15 +140,27 @@
    @ApiImplicitParams({
            @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
    })
//    @RequiresPermissions("business:goods:create")
    @RequiresPermissions("business:goods:create")
    public ApiResponse<Integer> importExcel (@ApiParam(value = "file") MultipartFile file) {
        return ApiResponse.success(goodsService.importBatch(file));
        Integer val = goodsService.importBatch(file);
        cateParamSelectService.dealCateParamSelect();
        return ApiResponse.success(val);
    }
    @ApiOperation("导入图片模板")
    @PostMapping("/importImgExcel")
    @ApiImplicitParams({
            @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
    })
    @RequiresPermissions("business:goods:update")
    public ApiResponse<Integer> importImgExcel (@ApiParam(value = "file") MultipartFile file) {
        Integer val = goodsService.importBatchImg(file);
        return ApiResponse.success(val);
    }


    @ApiOperation("修改状态")
    @PostMapping("/updateDisableById")
    @RequiresPermissions("business:category:update")
    @RequiresPermissions("business:goods:update")
    public ApiResponse updateDisableById(@RequestBody Goods goods) {
        goodsService.updateDisableById(goods);
        return ApiResponse.success(null);
@@ -140,15 +168,16 @@

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


    @ApiOperation("列表 - H5")
    @PostMapping("/list")
    public ApiResponse<List<Goods>> findList (@RequestBody Goods goods) {
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        goods.setCompanyId(user.getCompanyId());
        return ApiResponse.success(goodsService.findList(goods));
    }