blame | history | patch | commit | commitdiff | ignore whitespace
zepengdev
2025-06-26 4b1cb74450d178af66b3f87073edb441f6fbc103 
 oying-system/src/main/java/com/oying/modules/pc/product/rest/ProductController.java


@@ -1,6 +1,5 @@


package com.oying.modules.pc.product.rest;




import cn.hutool.core.collection.ListUtil;


import cn.hutool.core.util.ObjectUtil;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.oying.annotation.Log;


@@ -12,12 +11,13 @@


import com.oying.modules.pc.product.service.ProductImageService;


import com.oying.modules.pc.product.service.ProductLabelService;


import com.oying.modules.pc.product.service.ProductService;


import com.oying.utils.PageResult;


import com.oying.utils.R;


import io.swagger.annotations.Api;


import io.swagger.annotations.ApiOperation;


import io.swagger.annotations.ApiParam;


import lombok.RequiredArgsConstructor;


import org.apache.commons.lang3.ObjectUtils;


import org.springframework.http.HttpStatus;


import org.springframework.http.ResponseEntity;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.*;


@@ -67,7 +67,13 @@


    // @PreAuthorize("@el.check('product:list')")


    public ResponseEntity<?> getProductsByPage(ProductQueryCriteria criteria) {


        Page<Object> page = new Page<>(criteria.getPage(), criteria.getSize());


        return ResponseEntity.ok(R.success(productService.queryAll(criteria, page)));


        PageResult<Product> pageResult = productService.queryAll(criteria, page);


        pageResult.getContent().forEach(product -> {


            Long productId = product.getProductId();


            product.setImages(productImageService.queryImagesByProductId(productId));


            product.setLabels(productLabelService.queryLabelsByProductId(productId));


        });


        return ResponseEntity.ok(R.success(pageResult));


    }




    @GetMapping(value = "/{productId}}")


@@ -112,20 +118,16 @@


    @Log("新增商品")


    @ApiOperation("新增商品")


    //@PreAuthorize("@el.check('merchant:product:add')")


    public ResponseEntity<?> createProduct(@PathVariable Long storeId,


                                           @Validated @RequestBody ProductMerchantCreateRequest request) {


        request.setStoreId(ObjectUtils.defaultIfNull(request.getStoreId(), storeId));


    public ResponseEntity<?> createProduct(@Validated @RequestBody ProductMerchantCreateRequest request) {


        productAdminService.create(request);


        return ResponseEntity.noContent().build();


        return ResponseEntity.status(HttpStatus.CREATED).build();


    }




    @PutMapping


    @Log("修改商品")


    @ApiOperation("修改商品")


    // @PreAuthorize("@el.check('product:edit')")


    public ResponseEntity<?> updateProduct(@PathVariable Long productId,


                                           @Validated @RequestBody ProductMerchantUpdateRequest request) {


        request.setProductId(ObjectUtils.defaultIfNull(request.getProductId(), productId));


    public ResponseEntity<?> updateProduct(@Validated @RequestBody ProductMerchantUpdateRequest request) {


        productAdminService.update(request);


        return ResponseEntity.noContent().build();


    }