From 6d8ca83a81eb6601f22ca800a544faf5109f918f Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 19 九月 2023 14:37:35 +0800
Subject: [PATCH] 基础字段
---
server/company/src/main/java/com/doumee/api/business/GoodsController.java | 4 ++--
server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java | 2 +-
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 24 ++++--------------------
server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 20 +++-----------------
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 1 +
server/service/src/main/resources/mappers/CateParamSelectMapper.xml | 2 +-
server/company/src/main/java/com/doumee/api/business/BaseGoodsController.java | 2 +-
7 files changed, 13 insertions(+), 42 deletions(-)
diff --git a/server/company/src/main/java/com/doumee/api/business/BaseGoodsController.java b/server/company/src/main/java/com/doumee/api/business/BaseGoodsController.java
index c530726..94eb4c0 100644
--- a/server/company/src/main/java/com/doumee/api/business/BaseGoodsController.java
+++ b/server/company/src/main/java/com/doumee/api/business/BaseGoodsController.java
@@ -37,7 +37,7 @@
@PostMapping("/page")
// @RequiresPermissions("business:basegoods:query")
public ApiResponse<PageData<BaseGoods>> findPage (@RequestBody PageWrap<BaseGoods> pageWrap) {
- return ApiResponse.success(baseGoodsService.findPage(pageWrap));
+ return ApiResponse.success(baseGoodsService.findCompanyPage(pageWrap));
}
}
diff --git a/server/company/src/main/java/com/doumee/api/business/GoodsController.java b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
index 835b91e..42a7b24 100644
--- a/server/company/src/main/java/com/doumee/api/business/GoodsController.java
+++ b/server/company/src/main/java/com/doumee/api/business/GoodsController.java
@@ -54,7 +54,7 @@
@PreventRepeat
@ApiOperation("浼佷笟鏂板缓鍟嗗搧")
@PostMapping("/companyCreate")
-// @RequiresPermissions("business:goods:create")
+ @RequiresPermissions("business:goods:create")
public ApiResponse companyCreate(@RequestBody Goods goods) {
goodsService.companyCreate(goods);
cateParamSelectService.dealCateParamSelect();
@@ -139,7 +139,7 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
})
-// @RequiresPermissions("business:goods:create")
+ @RequiresPermissions("business:goods:create")
public ApiResponse<Integer> importExcel (@ApiParam(value = "file") MultipartFile file) {
Integer val = goodsService.importBatch(file);
cateParamSelectService.dealCateParamSelect();
diff --git a/server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java b/server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java
index 753912f..6119a63 100644
--- a/server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java
+++ b/server/service/src/main/java/com/doumee/service/business/BaseGoodsService.java
@@ -133,7 +133,7 @@
* @param pageWrap 鍒嗛〉瀵硅薄
* @return PageData<BaseGoods>
*/
- PageData<BaseGoods> findCompanyPage(PageWrap<BaseGoods> pageWrap,Integer companyId);
+ PageData<BaseGoods> findCompanyPage(PageWrap<BaseGoods> pageWrap);
/**
* 鏉′欢缁熻
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
index db4a088..d5826fb 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java
@@ -373,21 +373,8 @@
@Override
- public PageData<BaseGoods> findCompanyPage(PageWrap<BaseGoods> pageWrap ,Integer companyId) {
-
- //鏌ヨ浼佷笟宸茬粡瀛樺湪鐨勫晢鍝�
- List<Integer> collect = new ArrayList<>();
- if(Objects.nonNull(companyId)){
- QueryWrapper<Goods> goodsQuery = new QueryWrapper<>();
- goodsQuery.lambda().eq(Goods::getIsdeleted,Constants.ZERO)
- .eq(Goods::getCompanyId,companyId)
- .isNotNull(Goods::getGoodsId);
- List<Goods> goods = goodsMapper.selectList(goodsQuery);
- if (CollectionUtils.isEmpty(goods)){
- collect = goods.stream().map(s -> s.getGoodsId()).collect(Collectors.toList());
- }
- }
-
+ public PageData<BaseGoods> findCompanyPage(PageWrap<BaseGoods> pageWrap) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
pageWrap.getModel().setIsdeleted(Constants.ZERO);
IPage<BaseGoods> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
MPJLambdaWrapper<BaseGoods> queryWrapper = new MPJLambdaWrapper<>();
@@ -404,8 +391,7 @@
.eq(pageWrap.getModel().getCategoryId()!=null,BaseGoods::getCategoryId, pageWrap.getModel().getCategoryId())
.eq(pageWrap.getModel().getBrandId()!=null,BaseGoods::getBrandId, pageWrap.getModel().getBrandId())
.eq(pageWrap.getModel().getStatus()!=null,BaseGoods::getStatus, pageWrap.getModel().getStatus())
- .notIn(!CollectionUtils.isEmpty(collect),BaseGoods::getId, collect);
-
+ .notExists(user.getType().equals(Constants.UserType.COMPANY.getKey())," select 1 from goods g where g.GOODS_ID = t.id and g.TYPE = 1 and g.company_id = "+user.getCompanyId()+" ");
queryWrapper.orderByDesc(Goods::getId);
PageData<BaseGoods> pageData =PageData.from(baseGoodsJoinMapper.selectJoinPage(page,BaseGoods.class,queryWrapper));
String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
index 2af9103..02f664f 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java
@@ -197,6 +197,7 @@
.or().eq(Brand::getType,Constants.ONE)
);
}
+ queryWrapper.lambda().orderByAsc(Brand::getType);
queryWrapper.lambda().orderByAsc(Brand::getSortnum);
IPage<Brand> brandIPage = brandMapper.selectPage(page, queryWrapper);
String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
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 238da11..bb7ec36 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
@@ -207,9 +207,9 @@
.eq("ISDELETED",Constants.ZERO)
.eq("STATUS",Constants.ZERO)
.last(" limit 1 "));
- if(Objects.isNull(cateParam)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"浼佷笟鍒嗙被鏁版嵁鍚屾寮傚父璇疯仈绯荤鐞嗗憳");
- }
+// if(Objects.isNull(cateParam)){
+// throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"浼佷笟鍒嗙被鏁版嵁鍚屾寮傚父璇疯仈绯荤鐞嗗憳");
+// }
GoodsParam goodsParam = new GoodsParam();
goodsParam.setCreator(user.getId());
goodsParam.setCreateDate(new Date());
@@ -219,24 +219,8 @@
goodsParam.setGoodsId(goods.getId());
goodsParam.setVal(bgParam.getVal());
goodsParam.setName(bgParam.getName());
- goodsParam.setPramaId(cateParam.getId());
+ goodsParam.setPramaId(Objects.isNull(cateParam)?null: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);
-// };
-
}
}
}
diff --git a/server/service/src/main/resources/mappers/CateParamSelectMapper.xml b/server/service/src/main/resources/mappers/CateParamSelectMapper.xml
index f11a72c..04acf37 100644
--- a/server/service/src/main/resources/mappers/CateParamSelectMapper.xml
+++ b/server/service/src/main/resources/mappers/CateParamSelectMapper.xml
@@ -7,7 +7,7 @@
INSERT INTO `cate_param_select`
(`CREATOR`, `CREATE_DATE`, `EDITOR`, `EDIT_DATE`, `ISDELETED`, `REMARK`, `NAME`, `PARAM_ID`, `CATEGORY_ID`,
`STATUS`, `SORTNUM`)
- select #{userId} , now(),null , null , 0 , null , a.VAL , a.PRAMA_ID , b.CATEGORY_ID , 0 , null from goods_param a inner join goods b on a.GOODS_ID = b.ID
+ select DISTINCT #{userId} , now(),null , null , 0 , null , a.VAL , a.PRAMA_ID , b.CATEGORY_ID , 0 , null from goods_param a inner join goods b on a.GOODS_ID = b.ID
and a.PRAMA_ID is not null AND a.VAL is not null
and a.ISDELETED = 0
and a.`STATUS` = 0
--
Gitblit v1.9.3