From c166834a4aa5545a30115ea0195dab8dbab59fbd Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 20 九月 2023 15:12:10 +0800
Subject: [PATCH] pp
---
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 179 +++++++++++++++++++++++++++++++++++------------------------
1 files changed, 106 insertions(+), 73 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
index ad4b0c8..8050175 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -21,6 +21,8 @@
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.*;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -129,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())){
@@ -172,6 +175,8 @@
// 濡傛灉閫夋嫨骞冲彴鍟嗗搧鍜屾煡璇㈢粨鏋滃涓嶄笂锛屾彁绀洪敊璇�
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"瀵逛笉璧凤紝璇锋纭�夋嫨骞冲彴鍟嗗搧锛�");
}
+ List<Multifile> multifileList = new ArrayList<>();
+ List<GoodsParam> goodsParamList = new ArrayList<>();
for(BaseGoods model : goodsList){
//閬嶅巻骞冲彴鍟嗗搧淇℃伅锛岃繘琛屽晢鍝佷俊鎭悓姝�
Goods goods = initGoodsPlatParam(user,model,param);
@@ -180,16 +185,21 @@
}
goodsMapper.insert(goods);
//寮�濮嬪鐞嗛檮浠�
- dealPlatMultifule(goods.getId(),user,model);
+ dealPlatMultifule(goods.getId(),user,model,multifileList);
//寮�濮嬪鐞嗗弬鏁伴厤缃�
- dealPlatGoodsParam(model,goods,user);
+ dealPlatGoodsParam(model,goods,user,goodsParamList);
}
-
+ if(multifileList.size()>0){
+ multifileMapper.insertBatch(multifileList);
+ }
+ if(goodsParamList.size()>0){
+ goodsParamMapper.insertBatch(goodsParamList);
+ }
return 1;
}
- private void dealPlatGoodsParam(BaseGoods model, Goods goods, LoginUserInfo user) {
+ private void dealPlatGoodsParam(BaseGoods model, Goods goods, LoginUserInfo user,List<GoodsParam> paramList) {
BaseGoodsParam baseGoodsParam = new BaseGoodsParam();
baseGoodsParam.setGoodsId(model.getId());
baseGoodsParam.setIsdeleted(Constants.ZERO);
@@ -197,6 +207,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());
@@ -206,7 +226,9 @@
goodsParam.setGoodsId(goods.getId());
goodsParam.setVal(bgParam.getVal());
goodsParam.setName(bgParam.getName());
- goodsParamMapper.insert(goodsParam);
+ goodsParam.setPramaId(Objects.isNull(cateParam)?null:cateParam.getId());
+ paramList.add(goodsParam);
+// goodsParamMapper.insert(goodsParam);
}
}
}
@@ -215,6 +237,7 @@
Goods goods = new Goods();
goods.setIsdeleted(Constants.ZERO);
goods.setGoodsId(model.getId());
+ goods.setCompanyId(user.getCompanyId());
if(goodsMapper.selectCount(new QueryWrapper<>(goods))>0){
//濡傛灉宸茬粡鍚屾杩囷紝璺宠繃姝ゆ鍚屾
return null;
@@ -242,7 +265,7 @@
/**
* 寮�濮嬪鐞嗗钩鍙板晢鍝佸叧鑱旈檮浠讹紝澶嶅埗涓�濂楀埌浼佷笟鍟嗗搧涓�
*/
- private void dealPlatMultifule(Integer id, LoginUserInfo user, BaseGoods model) {
+ private void dealPlatMultifule(Integer id, LoginUserInfo user, BaseGoods model,List<Multifile> fileList ) {
Multifile f = new Multifile();
f.setObjId(model.getId());
f.setIsdeleted(Constants.ZERO);
@@ -261,7 +284,8 @@
multifile.setName(multifile.getName());
multifile.setSortnum(multifile.getSortnum());
multifile.setCompanyId(user.getCompanyId());
- multifileMapper.insert(multifile);
+ fileList.add(multifile);
+// multifileMapper.insert(multifile);
}
}
}
@@ -270,16 +294,16 @@
if(Constants.equalsInteger(Constants.ONE, param.getType())){
for(PlatGoodsParam p: param.getGoodsParamList()){
if(Constants.equalsInteger(model.getId(),p.getGoodsId())){
- return p.getPrice();
+ return p.getPrice().setScale(0,BigDecimal.ROUND_CEILING);
}
}
}
//濡傛灉娌℃湁閰嶇疆鍏ユ墜浠凤紝瀹夎鍔犱环绯绘暟鏉ヨ绠�
- if(model.getCateRatePrice()==null){
- model.setCateRatePrice(systemDictDataBiz.getGoodsPriceRate());
- }
- //杩斿洖
- return Constants.formatBigdecimal(model.getPrice()).multiply(model.getCateRatePrice()).multiply(param.getRate());
+// if(model.getCateRatePrice()==null){
+// model.setCateRatePrice(systemDictDataBiz.getGoodsPriceRate());
+// }
+ //杩斿洖 .multiply(model.getCateRatePrice())
+ return (Constants.formatBigdecimal(model.getPrice()).multiply(param.getRate())).setScale(0,BigDecimal.ROUND_CEILING);
}
@@ -315,6 +339,7 @@
multifile.setObjId(goods.getId());
multifile.setType(Constants.ZERO);
multifile.setObjType(Constants.ZERO);
+ multifile.setCompanyId(goods.getCompanyId());
multifileMapper.insert(multifile);
}
}
@@ -329,20 +354,6 @@
goodsParam.setSortnum(i+Constants.ONE);
goodsParam.setGoodsId(goods.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);
- };
}
}
return goods.getId();
@@ -427,7 +438,8 @@
}else{
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠鐧诲綍鐢ㄦ埛绫诲埆閿欒锛屾棤娉曡繘琛岃鎿嶄綔");
}
- if(goodsMapper.selectCount(new QueryWrapper<Goods>().eq("COMPANY_ID",user.getCompanyId()).eq("ISDELETED",Constants.ZERO).ne("id",goods.getId()).eq("name",goods.getName()))>0){
+ if(goodsMapper.selectCount(new QueryWrapper<Goods>().eq("COMPANY_ID",user.getCompanyId())
+ .eq("ISDELETED",Constants.ZERO).ne("id",goods.getId()).eq("name",goods.getName()))>0){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+goods.getName()+"銆戝凡瀛樺湪");
};
goods.setStatus(Constants.ZERO);
@@ -439,7 +451,8 @@
goods.setShortPinyin(PinYinUtil.getFirstSpell(goods.getName()));
goodsMapper.updateById(goods);
- multifileMapper.delete(new QueryWrapper<Multifile>().eq("OBJ_ID",goods.getId()));
+ multifileMapper.delete(new QueryWrapper<Multifile>().eq("OBJ_ID",goods.getId())
+ .eq("OBJ_TYPE",0).eq("COMPANY_ID",user.getCompanyId()));
List<Multifile> multifileList = goods.getMultifileList();
if(!Objects.isNull(multifileList)&&multifileList.size()>Constants.ZERO){
for (int i = 0; i < multifileList.size(); i++) {
@@ -450,6 +463,7 @@
multifile.setSortnum(i+Constants.ONE);
multifile.setObjId(goods.getId());
multifile.setType(Constants.ZERO);
+ multifile.setCompanyId(goods.getCompanyId());
multifile.setObjType(Constants.ZERO);
multifileMapper.insert(multifile);
}
@@ -467,19 +481,19 @@
goodsParam.setGoodsId(goods.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);
- };
+// 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);
+// };
}
}
}
@@ -504,7 +518,7 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
//鎷夊紡鍟嗗搧 涓� 涓婃灦鏃讹紝闇�瑕侀檺鍒� 骞冲彴鍟嗗搧鏄惁宸蹭笅鏋�
- if(dbGoods.getType().equals(Constants.goodsType.PULL)&&goods.getStatus().equals(Constants.ZERO)){
+ if(dbGoods.getType().equals(Constants.goodsType.PULL.getValue())&&goods.getStatus().equals(Constants.ZERO)){
BaseGoods baseGoods = baseGoodsMapper.selectById(dbGoods.getGoodsId());
if(Objects.isNull(baseGoods)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌骞冲彴鍟嗗搧淇℃伅");
@@ -542,7 +556,7 @@
continue;
}
//鎷夊紡鍟嗗搧 涓� 涓婃灦鏃讹紝闇�瑕侀檺鍒� 骞冲彴鍟嗗搧鏄惁宸蹭笅鏋�
- if(dbGoods.getType().equals(Constants.goodsType.PULL)&&batchDisableDTO.getStatus().equals(Constants.ZERO)){
+ if(dbGoods.getType().equals(Constants.goodsType.PULL.getValue())&&batchDisableDTO.getStatus().equals(Constants.ZERO)){
BaseGoods baseGoods = baseGoodsMapper.selectById(dbGoods.getGoodsId());
if(Objects.isNull(baseGoods)||!baseGoods.getStatus().equals(Constants.ZERO)){
errNum++;
@@ -647,7 +661,9 @@
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.eq(Goods::getStatus, pageWrap.getModel().getStatus());
}
-
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.eq(Goods::getType, pageWrap.getModel().getType());
+ }
if (pageWrap.getModel().getCategoryId() != null) {
queryWrapper.eq(Goods::getCategoryId, pageWrap.getModel().getCategoryId());
}
@@ -663,10 +679,6 @@
+ systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
goodsIPage.getRecords().forEach(i->{
i.setPrefixUrl(prefixUrl);
- if(i.getType().equals(Constants.ONE)){
- i.setBasePrice(i.getBasePrice().multiply(i.getBasePriceRate()));
- }
-
});
return PageData.from(goodsIPage);
}
@@ -780,7 +792,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);
@@ -801,7 +813,7 @@
if(mulFiles==null){
mulFiles = new ArrayList<>();
}
- mulFiles.add(baseDataService.getOssImgurl(ossModel,ossModel.getGoodsFolder(),f));
+ mulFiles.add(baseDataService.getOssImgurl(ossModel,ossModel.getGoodsFolder(),mf));
}
}
}
@@ -845,19 +857,19 @@
//鎻掑叆浜у搧鍙傛暟鍏宠仈琛�
goodsParamMapper.insert(gp);
//瀛樺偍 cate_param_select 鏌ヨ鏄惁宸插瓨鍦�
- if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
- .eq("PARAM_ID",gp.getPramaId()).eq("NAME",gp.getName()))<=Constants.ZERO){
- CateParamSelect cateParamSelect = new CateParamSelect();
- cateParamSelect.setCreator(user.getId());
- cateParamSelect.setCreateDate(new Date());
- cateParamSelect.setName(gp.getVal());
- cateParamSelect.setIsdeleted(Constants.ZERO);
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelect.setParamId(gp.getPramaId());
- cateParamSelect.setCategoryId(newModel.getCategoryId());
- cateParamSelect.setStatus(Constants.ZERO);
- cateParamSelectMapper.insert(cateParamSelect);
- };
+// if(cateParamSelectMapper.selectCount(new QueryWrapper<CateParamSelect>()
+// .eq("PARAM_ID",gp.getPramaId()).eq("NAME",gp.getName()))<=Constants.ZERO){
+// CateParamSelect cateParamSelect = new CateParamSelect();
+// cateParamSelect.setCreator(user.getId());
+// cateParamSelect.setCreateDate(new Date());
+// cateParamSelect.setName(gp.getVal());
+// cateParamSelect.setIsdeleted(Constants.ZERO);
+// cateParamSelect.setStatus(Constants.ZERO);
+// cateParamSelect.setParamId(gp.getPramaId());
+// cateParamSelect.setCategoryId(newModel.getCategoryId());
+// cateParamSelect.setStatus(Constants.ZERO);
+// cateParamSelectMapper.insert(cateParamSelect);
+// };
}
}
if(mulFiles !=null && mulFiles.size()>0){
@@ -872,6 +884,7 @@
f.setCreator(newModel.getCreator());
f.setIsdeleted(Constants.ZERO);
f.setSortnum(i);
+ f.setCompanyId(user.getCompanyId());
f.setFileurl(s);
multifileMapper.insert(f);
}
@@ -970,6 +983,7 @@
@Override
public void export(HttpServletRequest request, HttpServletResponse response) throws Exception {
try {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
String fileName = "浜у搧瀵煎叆琛�"+System.currentTimeMillis()+".xlsx";
// 鑾峰彇鏂囦欢杈撳叆娴�
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("static/file/goodsExcelTemp.xlsx");
@@ -983,7 +997,10 @@
// sheet.getPhysicalNumberOfRows()鑾峰彇鎬荤殑琛屾暟
// 寰幆璇诲彇姣忎竴琛�
Row row = sheet.createRow(1);
- List<Category> categoryList = categoryMapper.selectList(new QueryWrapper<Category>().eq("ISDELETED",0));
+ List<Category> categoryList = categoryMapper.selectList(
+ new QueryWrapper<Category>().eq("ISDELETED",0)
+ .eq("COMPANY_ID",loginUserInfo.getCompanyId())
+ );
categoryList.forEach(i->{
i.setParamList(cateParamMapper.selectList(new QueryWrapper<CateParam>().eq("ISDELETED",0).eq("CATEGORY_ID",i.getId())));
});
@@ -1042,18 +1059,26 @@
.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);
IPage<Goods> goodsIPage = goodsJoinMapper.selectJoinPage(page, Goods.class, queryWrapper);
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
goodsIPage.getRecords().forEach(i->{
+ i.setCategoryImgurl(systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.CATEGORY_IMG).getCode() + i.getCategoryImgurl());
i.setPrefixUrl(prefixUrl);
i.setMultifileList(multifileMapper.selectList(new QueryWrapper<Multifile>().eq("OBJ_ID",i.getId()).orderByAsc(" SORTNUM ")));
- i.setGoodsParamList(goodsParamMapper.selectList(new QueryWrapper<GoodsParam>().eq("GOODS_ID",i.getId()).orderByAsc(" SORTNUM ")));
+ i.setGoodsParamList(goodsParamMapper.selectList(new QueryWrapper<GoodsParam>()
+ .eq("GOODS_ID",i.getId())
+ .orderByAsc(" SORTNUM ")));
});
return PageData.from(goodsIPage);
}
@@ -1061,6 +1086,10 @@
@Override
public List<Goods> findListForH5(GoodsRequest goodsRequest) {
+ LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(!loginUserInfo.getType().equals(Constants.UserType.ZHUBO.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"闈炰富鎾敤鎴锋棤娉曚娇鐢�");
+ }
MPJLambdaWrapper<Goods> queryWrapper = new MPJLambdaWrapper<>();
queryWrapper.selectAll(Goods.class);
queryWrapper.selectAs(Category::getName, Goods::getCategoryName);
@@ -1072,6 +1101,7 @@
queryWrapper.leftJoin(Brand.class, Brand::getId, Goods::getBrandId);
queryWrapper.eq(Goods::getStatus,Constants.ZERO);
queryWrapper.eq(Goods::getIsdeleted,Constants.ZERO);
+ queryWrapper.eq(Goods::getCompanyId,loginUserInfo.getCompanyId());
queryWrapper.eq(!Objects.isNull(goodsRequest) && !Objects.isNull(goodsRequest.getCategoryId()), Goods::getCategoryId, goodsRequest.getCategoryId())
.eq(!Objects.isNull(goodsRequest) && !Objects.isNull(goodsRequest.getBrandId()), Goods::getBrandId, goodsRequest.getBrandId())
.and(!Objects.isNull(goodsRequest) && StringUtils.isNotBlank(goodsRequest.getKeyword()),
@@ -1085,12 +1115,15 @@
.apply(!Objects.isNull(goodsRequest) && !Objects.isNull(goodsRequest.getEPrice()), " t.PRICE <= "+goodsRequest.getEPrice()+" ");
queryWrapper.orderByDesc(Goods::getId);
List<Goods> goodsList = goodsJoinMapper.selectJoinList(Goods.class,queryWrapper);
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.GOODS_IMG).getCode();
goodsList.forEach(i->{
i.setPrefixUrl(prefixUrl);
i.setMultifileList(multifileMapper.selectList(new QueryWrapper<Multifile>().eq("OBJ_ID",i.getId()).orderByAsc(" SORTNUM ")));
- i.setGoodsParamList(goodsParamMapper.selectList(new QueryWrapper<GoodsParam>().eq("GOODS_ID",i.getId()).orderByAsc(" SORTNUM ")));
+ i.setGoodsParamList(goodsParamMapper.selectList(
+ new QueryWrapper<GoodsParam>().eq("GOODS_ID",i.getId())
+ .apply(" name in ( select cp.NAME from cate_param cp where cp.CATEGORY_ID = "+i.getCategoryId()+" and cp.ISSHOW = 1 and cp.ISDELETED = 0 and cp.STATUS = 0 ) ")
+ .orderByAsc(" SORTNUM ")));
});
return goodsList;
}
--
Gitblit v1.9.3