属性对比

jiangping

2023-09-21 2be17adffb5e055ed563ba73c928a5842c45a81e

 server/service/src/main/java/com/doumee/service/business/impl/BaseDataServiceImpl.java

@@ -300,7 +300,7 @@
            for(BaseData data :result.getRecords()){
                //多图，英文逗号隔开
                if(StringUtils.isNotBlank(data.getBgImg())){
                    String tImg =  data.getBgImg().replace("，", ",").replace(".avif", "").replace("/n1/jfs/", "/n0/jfs/");
                    String tImg =  data.getBgImg().replace("，", ",").replace(".avif", "").replace("/n1/jfs/", "/imgzone/jfs/");
                    String[] imgs =tImg.split(",");
                    data.setBgImgs(imgs);

@@ -384,7 +384,8 @@
                }
//                goods.setImgurl(getOssImgurl(ossModel,ossModel.getGoodsFolder(), data.getImgurl()));
                goods.setImgurl(getOssImgurlFile(ossModel.getGoodsFolder(), data.getImgurl(), data.getId(),Constants.ZERO,fileRecords));
                goods.setPrice(Constants.formatBigdecimal(data.getSaleprice()).multiply(Constants.formatBigdecimal(cModel.getPriceRate())));
//                goods.setPrice(Constants.formatBigdecimal(data.getSaleprice()).multiply(Constants.formatBigdecimal(cModel.getPriceRate())));
                goods.setPrice(Constants.formatBigdecimal(data.getSaleprice()));
                if(model!=null){
                    //如果已经存在，更新商品数据
                    goods.setEditDate(date);
@@ -461,10 +462,11 @@

    private int addImg(int i,OssModel ossModel, Integer id,String bgImg,List<Multifile> fileList,List<FileRecord> fileRecords) {
        if(StringUtils.isNotBlank(bgImg)){
            bgImg = bgImg.replace("/n1/jfs/", "/imgzone/jfs/");
//            String img =getOssImgurl(ossModel, ossModel.getGoodsFolder() ,bgImg);
            String img = getOssImgurlFile(ossModel.getGoodsFolder(), bgImg, null,Constants.TWO,fileRecords);
            if(StringUtils.isNotBlank(img)){
                img = img.replace("/n1/jfs/", "/n0/jfs/");

                Multifile f = new Multifile();
                f.setFileurl(img);
                f.setObjType(Constants.ONE);
@@ -510,40 +512,6 @@
            }
        }

//        dealCateParam(cateId,goodsId,data.getAttr1(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr2(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr3(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr4(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr5(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr6(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr7(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr8(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr9(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr10(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr11(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr12(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr13(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr14(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr15(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr16(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr17(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr18(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr19(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr20(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr21(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr22(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr23(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr24(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr25(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr26(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr27(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr28(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr29(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr30(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr31(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr32(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr33(),cateList);
//        dealCateParam(cateId,goodsId,data.getAttr34(),cateList);
    }

    private void dealCateParam(Integer cateId, Integer goodsId, String attr,List<BaseCateParam> list,List<BaseGoodsParam> paramList) {
@@ -557,7 +525,10 @@
            return;
        }
        String attrName = attr.substring(0,index);
        if(StringUtils.isBlank(attrName) || StringUtils.equals(attrName, "商品名称") || StringUtils.equals(attrName, "商品编号")){
        if(StringUtils.isBlank(attrName)
                || StringUtils.equals(attrName, "商品名称")
                || StringUtils.equals(attrName, "商品编号")
                || StringUtils.equals(attrName, "店铺")){
            return;
        }
        String val = attr.substring(index+1);