server/company/src/main/java/com/doumee/api/business/CategoryController.java
@@ -131,7 +131,7 @@ return ApiResponse.success(null); } @ApiOperation("列表 - H5") @ApiOperation("列表") @PostMapping("/list") public ApiResponse<List<Category>> findList (@RequestBody Category category) { return ApiResponse.success(categoryService.findList(category)); server/service/src/main/java/com/doumee/core/servlet/ServletRewriteFilter.java
@@ -33,17 +33,17 @@ // 允许响应流读取响应结果 ServletResponse responseWrapper = new ServletDuplicateResponseWrapper(httpServletResponse); try { filterChain.doFilter(requestWrapper, responseWrapper); }catch ( Exception e){ e.printStackTrace(); if(e.getCause().getCause() instanceof FileSizeLimitExceededException){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，系统附件上传请限制在200M以内"); }else if(e.getCause().getCause() instanceof SizeLimitExceededException){ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，系统附件上传请限制在200M以内!"); }else{ throw new BusinessException(ResponseStatus.SERVER_ERROR); } } } } server/service/src/main/java/com/doumee/dao/business/model/GoodsImport.java
@@ -44,12 +44,6 @@ @ExcelColumn(name="入手价",value = "price") private String price; @ExcelColumn(name="属性1",value = "attrFirstNames") private String attrFirstNames; @ExcelColumn(name="属性2",value = "attrSecodNames") private String attrSecodNames; @ExcelColumn(name="产品参数",value = "产品参数") private String paramStr;
@@ -17,6 +17,7 @@ @ApiModelProperty(value = "类别编码",example = "1") private Integer categoryId; @ApiModelProperty(value = "商品范围 0全部 1部分",example = "1") private Integer type;
@@ -191,7 +191,7 @@ queryWrapper.lambda().eq(Brand::getType,Constants.ONE); }else { queryWrapper.lambda().and(i->i.eq(Brand::getCompanyId,user.getCompanyId()) .or().eq(Brand::getType,Constants.ZERO) .or().eq(Brand::getType,Constants.ONE) ); } queryWrapper.lambda().orderByAsc(Brand::getSortnum); server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -421,14 +421,14 @@ .eq("COMPANY_ID",user.getCompanyId()) .orderByAsc(" SORTNUM "); List<Category> list = categoryMapper.selectList(wrapper); String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode(); for (Category c:list) { c.setPrefixUrl(prefixUrl); c.setAttrFirstList(cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("TYPE",Constants.ZERO).eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",c.getId()).orderByAsc(" SORTNUM "))); c.setAttrSecondList(cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("TYPE",Constants.ONE).eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",c.getId()).orderByAsc(" SORTNUM "))); c.setBudgetList(cateBudgetMapper.selectList(new QueryWrapper<CateBudget>().eq("CATEGORY_ID",c.getId()).orderByAsc(" SORTNUM "))); } // String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode() // + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode(); // for (Category c:list) { // c.setPrefixUrl(prefixUrl); // c.setAttrFirstList(cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("TYPE",Constants.ZERO).eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",c.getId()).orderByAsc(" SORTNUM "))); // c.setAttrSecondList(cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("TYPE",Constants.ONE).eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",c.getId()).orderByAsc(" SORTNUM "))); // c.setBudgetList(cateBudgetMapper.selectList(new QueryWrapper<CateBudget>().eq("CATEGORY_ID",c.getId()).orderByAsc(" SORTNUM "))); // } return list; } @@ -446,7 +446,7 @@ .eq("COMPANY_ID",user.getCompanyId()) .orderByAsc(" SORTNUM "); List<Category> list = categoryMapper.selectList(wrapper); String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.FILE_DIR).getCode() String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode(); for (Category c:list) { c.setPrefixUrl(prefixUrl); @@ -494,7 +494,7 @@ .eq("ISDELETED",Constants.ZERO) .orderByAsc(" SORTNUM "); List<Category> list = categoryMapper.selectList(wrapper); String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.FILE_DIR).getCode() String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode(); for (Category c:list) { c.setPrefixUrl(prefixUrl); @@ -552,7 +552,7 @@ .eq("ISDELETED",Constants.ZERO) .orderByAsc(" SORTNUM "); List<Category> list = categoryMapper.selectList(wrapper); String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.FILE_DIR).getCode() String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode(); for (Category c:list) { c.setPrefixUrl(prefixUrl); server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -21,6 +21,7 @@ import com.doumee.service.business.BaseDataService; import com.doumee.service.business.GoodsService; import com.github.yulichang.wrapper.MPJLambdaWrapper; import io.swagger.v3.oas.annotations.callbacks.Callback; import lombok.extern.java.Log; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.*; @@ -130,6 +131,7 @@ return goods.getId(); } @Override @Transactional( rollbackFor = {Exception.class, BusinessException.class}) public Integer createPlat(GoodCreatePlatRequest param){ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); if(!Constants.equalsInteger(user.getType(), Constants.UserType.COMPANY.getKey())){ @@ -198,6 +200,16 @@ if(!Objects.isNull(goodsParamList)&&goodsParamList.size()>0){ for (int i = 0; i < goodsParamList.size(); i++) { BaseGoodsParam bgParam = goodsParamList.get(i); //根据平台商品配置的平台参数信息查询企业绑定的参数信息 进行存储到 企业商品参数内 CateParam cateParam = cateParamMapper.selectOne(new QueryWrapper<CateParam>() .eq("CATEGORY_ID",goods.getCategoryId()) .eq("BASE_CATE_PARAM_ID",bgParam.getPramaId()) .eq("ISDELETED",Constants.ZERO) .eq("STATUS",Constants.ZERO) .last(" limit 1 ")); if(Objects.isNull(cateParam)){ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"企业分类数据同步异常请联系管理员"); } GoodsParam goodsParam = new GoodsParam(); goodsParam.setCreator(user.getId()); goodsParam.setCreateDate(new Date()); @@ -207,7 +219,24 @@ goodsParam.setGoodsId(goods.getId()); goodsParam.setVal(bgParam.getVal()); goodsParam.setName(bgParam.getName()); goodsParam.setPramaId(cateParam.getId()); goodsParamMapper.insert(goodsParam); //存储 cate_param_select 查询是否已存在 if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>() .eq("PARAM_ID",goodsParam.getPramaId()).eq("NAME",goodsParam.getName()))<=Constants.ZERO){ CateParamSelect cateParamSelect = new CateParamSelect(); cateParamSelect.setCreator(user.getId()); cateParamSelect.setCreateDate(new Date()); cateParamSelect.setName(goodsParam.getVal()); cateParamSelect.setIsdeleted(Constants.ZERO); cateParamSelect.setStatus(Constants.ZERO); cateParamSelect.setParamId(goodsParam.getPramaId()); cateParamSelect.setCategoryId(goods.getCategoryId()); cateParamSelect.setStatus(Constants.ZERO); cateParamSelectMapper.insert(cateParamSelect); }; } } } @@ -781,7 +810,7 @@ String proDir =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.PROJECTS).getCode(); String path = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.GOODS_IMG_DIR).getCode() + proDir; + proDir + File.separator + user.getCompanyId(); if(StringUtils.isNotBlank(path)){ OssModel ossModel = baseDataService.initOssModel(); File dir =new File(path+File.separator+newModel.getRemark()+File.separator); @@ -802,7 +831,7 @@ if(mulFiles==null){ mulFiles = new ArrayList<>(); } mulFiles.add(baseDataService.getOssImgurl(ossModel,ossModel.getGoodsFolder(),f)); mulFiles.add(baseDataService.getOssImgurl(ossModel,ossModel.getGoodsFolder(),mf)); } } } @@ -873,6 +902,7 @@ f.setCreator(newModel.getCreator()); f.setIsdeleted(Constants.ZERO); f.setSortnum(i); f.setCompanyId(user.getCompanyId()); f.setFileurl(s); multifileMapper.insert(f); } @@ -1047,8 +1077,12 @@ .or().like(Goods::getShortPinyin,pageWrap.getModel().getKeyword()) .or().like(Goods::getName,pageWrap.getModel().getKeyword()) ) .apply(!Objects.isNull(pageWrap.getModel()) && !Objects.isNull(pageWrap.getModel().getAttrFirst()), " find_in_set('"+pageWrap.getModel().getAttrFirst()+"',t.ATTR_FIRST_IDS) ") .apply(!Objects.isNull(pageWrap.getModel()) && !Objects.isNull(pageWrap.getModel().getAttrSecond()), " find_in_set('"+pageWrap.getModel().getAttrSecond()+"',t.ATTR_SECOD_IDS) ") // .apply(!Objects.isNull(pageWrap.getModel()) && !Objects.isNull(pageWrap.getModel().getAttrFirst()), " find_in_set('"+pageWrap.getModel().getAttrFirst()+"',t.ATTR_FIRST_IDS) ") // .apply(!Objects.isNull(pageWrap.getModel()) && !Objects.isNull(pageWrap.getModel().getAttrSecond()), " find_in_set('"+pageWrap.getModel().getAttrSecond()+"',t.ATTR_SECOD_IDS) ") .apply(!Objects.isNull(pageWrap.getModel()) && !Objects.isNull(pageWrap.getModel().getAttrFirst()), " t.id in ( SELECT gp.GOODS_ID FROM cate_param_select cps , goods_param gp where gp.PRAMA_ID = cps.PARAM_ID and gp.VAL = cps.`NAME` " + " and cps.ID = '"+pageWrap.getModel().getAttrFirst()+"' ) ") .apply(!Objects.isNull(pageWrap.getModel()) && !Objects.isNull(pageWrap.getModel().getAttrSecond()), " t.id in ( SELECT gp.GOODS_ID FROM cate_param_select cps , goods_param gp where gp.PRAMA_ID = cps.PARAM_ID and gp.VAL = cps.`NAME` " + " and cps.ID = '"+pageWrap.getModel().getAttrSecond()+"' ) ") .apply(!Objects.isNull(pageWrap.getModel()) && !Objects.isNull(pageWrap.getModel().getSPrice()), " t.PRICE >= "+pageWrap.getModel().getSPrice()+" ") .apply(!Objects.isNull(pageWrap.getModel()) && !Objects.isNull(pageWrap.getModel().getEPrice()), " t.PRICE <= "+pageWrap.getModel().getEPrice()+" "); queryWrapper.orderByDesc(Goods::getId); server/service/src/main/resources/static/file/goodsExcelTemp.xlsxBinary files differ
