完善格式化功能

shiyj1101

2021-08-05 e57e32fc43da31917912eebb4e47d4e50df1a9e9

 service-goods/src/main/java/com/java110/goods/api/ProductApi.java

old mode 100644
new mode 100755
@@ -6,6 +6,8 @@
import com.java110.dto.product.ProductSpecDetailDto;
import com.java110.dto.product.ProductSpecDto;
import com.java110.dto.productAttr.ProductAttrDto;
import com.java110.dto.productDetail.ProductDetailDto;
import com.java110.dto.productLabel.ProductLabelDto;
import com.java110.dto.productSpecValue.ProductSpecValueDto;
import com.java110.goods.bmo.product.IDeleteProductBMO;
import com.java110.goods.bmo.product.IGetProductBMO;
@@ -15,6 +17,14 @@
import com.java110.goods.bmo.productAttr.IGetProductAttrBMO;
import com.java110.goods.bmo.productAttr.ISaveProductAttrBMO;
import com.java110.goods.bmo.productAttr.IUpdateProductAttrBMO;
import com.java110.goods.bmo.productDetail.IDeleteProductDetailBMO;
import com.java110.goods.bmo.productDetail.IGetProductDetailBMO;
import com.java110.goods.bmo.productDetail.ISaveProductDetailBMO;
import com.java110.goods.bmo.productDetail.IUpdateProductDetailBMO;
import com.java110.goods.bmo.productLabel.IDeleteProductLabelBMO;
import com.java110.goods.bmo.productLabel.IGetProductLabelBMO;
import com.java110.goods.bmo.productLabel.ISaveProductLabelBMO;
import com.java110.goods.bmo.productLabel.IUpdateProductLabelBMO;
import com.java110.goods.bmo.productSpec.IDeleteProductSpecBMO;
import com.java110.goods.bmo.productSpec.IGetProductSpecBMO;
import com.java110.goods.bmo.productSpec.ISaveProductSpecBMO;
@@ -31,17 +41,14 @@
import com.java110.po.product.ProductSpecDetailPo;
import com.java110.po.product.ProductSpecPo;
import com.java110.po.productAttr.ProductAttrPo;
import com.java110.po.productDetail.ProductDetailPo;
import com.java110.po.productLabel.ProductLabelPo;
import com.java110.po.productSpecValue.ProductSpecValuePo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.List;
@@ -50,6 +57,16 @@
@RestController
@RequestMapping(value = "/product")
public class ProductApi {

    @Autowired
    private ISaveProductLabelBMO saveProductLabelBMOImpl;
    @Autowired
    private IUpdateProductLabelBMO updateProductLabelBMOImpl;
    @Autowired
    private IDeleteProductLabelBMO deleteProductLabelBMOImpl;

    @Autowired
    private IGetProductLabelBMO getProductLabelBMOImpl;

    @Autowired
    private ISaveProductBMO saveProductBMOImpl;
@@ -102,6 +119,17 @@
    private IGetProductAttrBMO getProductAttrBMOImpl;


    @Autowired
    private ISaveProductDetailBMO saveProductDetailBMOImpl;
    @Autowired
    private IUpdateProductDetailBMO updateProductDetailBMOImpl;
    @Autowired
    private IDeleteProductDetailBMO deleteProductDetailBMOImpl;

    @Autowired
    private IGetProductDetailBMO getProductDetailBMOImpl;


    /**
     * 微信保存消息模板
     *
@@ -120,11 +148,49 @@
        Assert.hasKeyAndValue(reqJson, "unitName", "请求报文中未包含unitName");
        Assert.hasKeyAndValue(reqJson, "sort", "请求报文中未包含sort");
        Assert.hasKeyAndValue(reqJson, "isPostage", "请求报文中未包含isPostage");
        Assert.hasKeyAndValue(reqJson, "coverPhoto", "请求报文中未包含商品封面");
        Assert.hasKeyAndValue(reqJson, "content", "请求报文中未包含商品描述");

        Assert.hasKey(reqJson, "carouselFigurePhoto", "请求报文中未包含轮播图");
        Assert.hasKey(reqJson, "productSpecs", "请求报文中未包含规格信息");


        String coverPhoto = reqJson.getString("coverPhoto");
        JSONArray carouselFigurePhoto = reqJson.getJSONArray("carouselFigurePhoto");

        JSONArray productSpecs = reqJson.getJSONArray("productSpecs");

        if (carouselFigurePhoto.size() < 1) {
            throw new IllegalArgumentException("请求报文中未包含轮播图");
        }
        if (productSpecs.size() < 1) {
            throw new IllegalArgumentException("请求报文中未包含规格信息");
        }

        JSONObject spec = null;
        List<ProductSpecValuePo> productSpecValuePos = new ArrayList<>();
        boolean hasDefault = false;
        ProductSpecValuePo productSpecValuePo = null;
        for (int specIndex = 0; specIndex < productSpecs.size(); specIndex++) {
            spec = productSpecs.getJSONObject(specIndex);
            productSpecValuePo = BeanConvertUtil.covertBean(spec, ProductSpecValuePo.class);
            productSpecValuePos.add(productSpecValuePo);
            if("T".equals(productSpecValuePo.getIsDefault())){
                hasDefault = true;
            }
        }

        if(!hasDefault){
            throw new IllegalArgumentException("请求报文中未包含默认规格");
        }

        ProductPo productPo = BeanConvertUtil.covertBean(reqJson, ProductPo.class);
        productPo.setStoreId(storeId);
        return saveProductBMOImpl.save(productPo);

        ProductDetailPo productDetailPo = new ProductDetailPo();
        productDetailPo.setStoreId(storeId);
        productDetailPo.setContent(reqJson.getString("content"));
        return saveProductBMOImpl.save(productPo, coverPhoto, carouselFigurePhoto, productSpecValuePos, productDetailPo);
    }

    /**
@@ -146,10 +212,44 @@
        Assert.hasKeyAndValue(reqJson, "isPostage", "请求报文中未包含isPostage");
        Assert.hasKeyAndValue(reqJson, "productId", "productId不能为空");

        String coverPhoto = reqJson.containsKey("coverPhoto") ? reqJson.getString("coverPhoto") : "";
        JSONArray carouselFigurePhoto = reqJson.containsKey("carouselFigurePhoto") ? reqJson.getJSONArray("carouselFigurePhoto") : null;

        JSONArray productSpecs = reqJson.containsKey("productSpecs") ? reqJson.getJSONArray("productSpecs") : null;

        JSONObject spec = null;
        List<ProductSpecValuePo> productSpecValuePos = null;

        boolean hasDefault = false;
        ProductSpecValuePo productSpecValuePo = null;
        if (productSpecs != null) {
            productSpecValuePos = new ArrayList<>();
            for (int specIndex = 0; specIndex < productSpecs.size(); specIndex++) {
                spec = productSpecs.getJSONObject(specIndex);
                productSpecValuePo = BeanConvertUtil.covertBean(spec, ProductSpecValuePo.class);
                productSpecValuePos.add(productSpecValuePo);
                if("T".equals(productSpecValuePo.getIsDefault())){
                    hasDefault = true;
                }
            }
        }

        if(!hasDefault){
            throw new IllegalArgumentException("请求报文中未包含默认规格");
        }

        ProductPo productPo = BeanConvertUtil.covertBean(reqJson, ProductPo.class);
        productPo.setStoreId(storeId);
        return updateProductBMOImpl.update(productPo);


        ProductDetailPo productDetailPo = null;
        if (reqJson.containsKey("content")) {
            productDetailPo = new ProductDetailPo();
            productDetailPo.setStoreId(storeId);
            productDetailPo.setContent(reqJson.getString("content"));
        }

        return updateProductBMOImpl.update(productPo, coverPhoto, carouselFigurePhoto, productSpecValuePos, productDetailPo);
    }

    /**
@@ -183,12 +283,14 @@
     */
    @RequestMapping(value = "/queryProduct", method = RequestMethod.GET)
    public ResponseEntity<String> queryProduct(@RequestHeader(value = "store-id") String storeId,
                                               @RequestParam(value = "productId", required = false) String productId,
                                               @RequestParam(value = "page") int page,
                                               @RequestParam(value = "row") int row) {
        ProductDto productDto = new ProductDto();
        productDto.setPage(page);
        productDto.setRow(row);
        productDto.setStoreId(storeId);
        productDto.setProductId(productId);
        return getProductBMOImpl.get(productDto);
    }

@@ -212,24 +314,24 @@

        JSONArray specDetails = reqJson.getJSONArray("specDetails");

        if(specDetails.size() < 1){
        if (specDetails.size() < 1) {
            throw new IllegalArgumentException("未包含规格信息");
        }
        ProductSpecDetailPo productSpecDetailPo = null;
        JSONObject specDetail = null;
        List<ProductSpecDetailPo> productSpecDetailPos = new ArrayList<>();
        for(int detailIndex = 0 ; detailIndex < specDetails.size(); detailIndex ++){
        for (int detailIndex = 0; detailIndex < specDetails.size(); detailIndex++) {
            specDetail = specDetails.getJSONObject(detailIndex);
            Assert.hasKeyAndValue(specDetail,"detailName","未包含规格");
            Assert.hasKeyAndValue(specDetail,"detailValue","未包含规格值");
            productSpecDetailPo = BeanConvertUtil.covertBean(specDetail,ProductSpecDetailPo.class);
            Assert.hasKeyAndValue(specDetail, "detailName", "未包含规格");
            Assert.hasKeyAndValue(specDetail, "detailValue", "未包含规格值");
            productSpecDetailPo = BeanConvertUtil.covertBean(specDetail, ProductSpecDetailPo.class);
            productSpecDetailPos.add(productSpecDetailPo);
        }


        ProductSpecPo productSpecPo = BeanConvertUtil.covertBean(reqJson, ProductSpecPo.class);
        productSpecPo.setStoreId(storeId);
        return saveProductSpecBMOImpl.save(productSpecPo,productSpecDetailPos);
        return saveProductSpecBMOImpl.save(productSpecPo, productSpecDetailPos);
    }

    /**
@@ -254,23 +356,23 @@

        JSONArray specDetails = reqJson.getJSONArray("specDetails");

        if(specDetails.size() < 1){
        if (specDetails.size() < 1) {
            throw new IllegalArgumentException("未包含规格信息");
        }
        ProductSpecDetailPo productSpecDetailPo = null;
        JSONObject specDetail = null;
        List<ProductSpecDetailPo> productSpecDetailPos = new ArrayList<>();
        for(int detailIndex = 0 ; detailIndex < specDetails.size(); detailIndex ++){
        for (int detailIndex = 0; detailIndex < specDetails.size(); detailIndex++) {
            specDetail = specDetails.getJSONObject(detailIndex);
            Assert.hasKeyAndValue(specDetail,"detailName","未包含规格");
            Assert.hasKeyAndValue(specDetail,"detailValue","未包含规格值");
            productSpecDetailPo = BeanConvertUtil.covertBean(specDetail,ProductSpecDetailPo.class);
            Assert.hasKeyAndValue(specDetail, "detailName", "未包含规格");
            Assert.hasKeyAndValue(specDetail, "detailValue", "未包含规格值");
            productSpecDetailPo = BeanConvertUtil.covertBean(specDetail, ProductSpecDetailPo.class);
            productSpecDetailPos.add(productSpecDetailPo);
        }

        ProductSpecPo productSpecPo = BeanConvertUtil.covertBean(reqJson, ProductSpecPo.class);
        productSpecPo.setStoreId(storeId);
        return updateProductSpecBMOImpl.update(productSpecPo,productSpecDetailPos);
        return updateProductSpecBMOImpl.update(productSpecPo, productSpecDetailPos);
    }

    /**
@@ -580,4 +682,170 @@
        productAttrDto.setProductId(productId);
        return getProductAttrBMOImpl.get(productAttrDto);
    }


    /**
     * 微信保存消息模板
     *
     * @param reqJson
     * @return
     * @serviceCode /product/saveProductDetail
     * @path /app/product/saveProductDetail
     */
    @RequestMapping(value = "/saveProductDetail", method = RequestMethod.POST)
    public ResponseEntity<String> saveProductDetail(@RequestBody JSONObject reqJson,
                                                    @RequestHeader(value = "store-id") String storeId) {

        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
        Assert.hasKeyAndValue(reqJson, "content", "请求报文中未包含content");


        ProductDetailPo productDetailPo = BeanConvertUtil.covertBean(reqJson, ProductDetailPo.class);
        productDetailPo.setStoreId(storeId);
        return saveProductDetailBMOImpl.save(productDetailPo);
    }

    /**
     * 微信修改消息模板
     *
     * @param reqJson
     * @return
     * @serviceCode /product/updateProductDetail
     * @path /app/product/updateProductDetail
     */
    @RequestMapping(value = "/updateProductDetail", method = RequestMethod.POST)
    public ResponseEntity<String> updateProductDetail(@RequestBody JSONObject reqJson,
                                                      @RequestHeader(value = "store-id") String storeId) {

        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
        Assert.hasKeyAndValue(reqJson, "storeId", "请求报文中未包含storeId");
        Assert.hasKeyAndValue(reqJson, "content", "请求报文中未包含content");
        Assert.hasKeyAndValue(reqJson, "detailId", "detailId不能为空");


        ProductDetailPo productDetailPo = BeanConvertUtil.covertBean(reqJson, ProductDetailPo.class);
        productDetailPo.setStoreId(storeId);
        return updateProductDetailBMOImpl.update(productDetailPo);
    }

    /**
     * 微信删除消息模板
     *
     * @param reqJson
     * @return
     * @serviceCode /product/deleteProductDetail
     * @path /app/product/deleteProductDetail
     */
    @RequestMapping(value = "/deleteProductDetail", method = RequestMethod.POST)
    public ResponseEntity<String> deleteProductDetail(@RequestBody JSONObject reqJson, @RequestHeader(value = "store-id") String storeId) {
        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");

        Assert.hasKeyAndValue(reqJson, "detailId", "detailId不能为空");


        ProductDetailPo productDetailPo = BeanConvertUtil.covertBean(reqJson, ProductDetailPo.class);
        productDetailPo.setStoreId(storeId);
        return deleteProductDetailBMOImpl.delete(productDetailPo);
    }

    /**
     * 微信删除消息模板
     *
     * @param storeId 小区ID
     * @return
     * @serviceCode /product/queryProductDetail
     * @path /app/product/queryProductDetail
     */
    @RequestMapping(value = "/queryProductDetail", method = RequestMethod.GET)
    public ResponseEntity<String> queryProductDetail(@RequestHeader(value = "store-id") String storeId,
                                                     @RequestParam(value = "productId") String productId,
                                                     @RequestParam(value = "page") int page,
                                                     @RequestParam(value = "row") int row) {
        ProductDetailDto productDetailDto = new ProductDetailDto();
        productDetailDto.setPage(page);
        productDetailDto.setRow(row);
        productDetailDto.setStoreId(storeId);
        productDetailDto.setProductId(productId);
        return getProductDetailBMOImpl.get(productDetailDto);
    }


    /**
     * 微信保存消息模板
     *
     * @param reqJson
     * @return
     * @serviceCode /product/saveProductLabel
     * @path /app/product/saveProductLabel
     */
    @RequestMapping(value = "/saveProductLabel", method = RequestMethod.POST)
    public ResponseEntity<String> saveProductLabel(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "labelCd", "请求报文中未包含labelCd");
        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");


        ProductLabelPo productLabelPo = BeanConvertUtil.covertBean(reqJson, ProductLabelPo.class);
        return saveProductLabelBMOImpl.save(productLabelPo);
    }

    /**
     * 微信修改消息模板
     *
     * @param reqJson
     * @return
     * @serviceCode /product/updateProductLabel
     * @path /app/product/updateProductLabel
     */
    @RequestMapping(value = "/updateProductLabel", method = RequestMethod.POST)
    public ResponseEntity<String> updateProductLabel(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "labelCd", "请求报文中未包含labelCd");
        Assert.hasKeyAndValue(reqJson, "productId", "请求报文中未包含productId");
        Assert.hasKeyAndValue(reqJson, "labelId", "labelId不能为空");


        ProductLabelPo productLabelPo = BeanConvertUtil.covertBean(reqJson, ProductLabelPo.class);
        return updateProductLabelBMOImpl.update(productLabelPo);
    }

    /**
     * 微信删除消息模板
     *
     * @param reqJson
     * @return
     * @serviceCode /product/deleteProductLabel
     * @path /app/product/deleteProductLabel
     */
    @RequestMapping(value = "/deleteProductLabel", method = RequestMethod.POST)
    public ResponseEntity<String> deleteProductLabel(@RequestBody JSONObject reqJson) {

        Assert.hasKeyAndValue(reqJson, "labelId", "labelId不能为空");


        ProductLabelPo productLabelPo = BeanConvertUtil.covertBean(reqJson, ProductLabelPo.class);
        return deleteProductLabelBMOImpl.delete(productLabelPo);
    }

    /**
     * 微信删除消息模板
     *
     * @return
     * @serviceCode /product/queryProductLabel
     * @path /app/product/queryProductLabel
     */
    @RequestMapping(value = "/queryProductLabel", method = RequestMethod.GET)
    public ResponseEntity<String> queryProductLabel(@RequestParam(value = "labelCd", required = false) String labelCd,
                                                    @RequestParam(value = "hasProduct", required = false) String hasProduct,
                                                    @RequestParam(value = "page") int page,
                                                    @RequestParam(value = "row") int row) {
        ProductLabelDto productLabelDto = new ProductLabelDto();
        productLabelDto.setPage(page);
        productLabelDto.setRow(row);
        productLabelDto.setLabelCd(labelCd);
        productLabelDto.setHasProduct(hasProduct);
        return getProductLabelBMOImpl.get(productLabelDto);
    }

}