账户提现新增功能完善

shiyj1101

2021-06-16 d0028c4028e0eb447f36d24f3ef9bd790eb0540c

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

old mode 100644
new mode 100755
@@ -169,9 +169,19 @@

        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);
            productSpecValuePos.add(BeanConvertUtil.covertBean(spec, ProductSpecValuePo.class));
            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);
@@ -209,13 +219,23 @@

        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);
                productSpecValuePos.add(BeanConvertUtil.covertBean(spec, ProductSpecValuePo.class));
                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);
@@ -800,7 +820,6 @@
     */
    @RequestMapping(value = "/deleteProductLabel", method = RequestMethod.POST)
    public ResponseEntity<String> deleteProductLabel(@RequestBody JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");

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