From 421a63cdb3427136c297a17f6b38e22036ad20e9 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 19 九月 2023 20:03:14 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/preselect into dev
---
server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java | 2
server/service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java | 45 +++++------
server/service/src/main/java/com/doumee/service/business/impl/BaseGoodsServiceImpl.java | 2
server/company/src/main/java/com/doumee/api/business/CategoryController.java | 1
company_admin/src/components/business/OperaCategoryWindow.vue | 16 +++
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 1
company_admin/src/views/business/goods.vue | 4
company_admin/src/utils/request.js | 2
server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java | 12 +-
server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java | 103 +++++++++++--------------
server/company/src/main/java/com/doumee/config/shiro/ShiroRealm.java | 2
11 files changed, 94 insertions(+), 96 deletions(-)
diff --git a/company_admin/src/components/business/OperaCategoryWindow.vue b/company_admin/src/components/business/OperaCategoryWindow.vue
index eff1478..16bdce6 100644
--- a/company_admin/src/components/business/OperaCategoryWindow.vue
+++ b/company_admin/src/components/business/OperaCategoryWindow.vue
@@ -225,6 +225,12 @@
// 璋冪敤鏂板缓鎺ュ彛
this.isWorking = true
if (!this.form.id) {
+ let arr = []
+ this.form.budgetList.forEach(item => {
+ if (item.maxamount || item.minamount) {
+ arr.push(item)
+ }
+ })
companyCreate({
paramList: this.form.tableData,
type: this.form.type,
@@ -232,7 +238,7 @@
platCateId: this.form.platCateId,
name: this.form.name,
imgurl: this.form.imgurl,
- budgetList: this.form.budgetList
+ budgetList: arr
})
.then(() => {
this.visible = false
@@ -246,6 +252,12 @@
this.isWorking = false
})
} else {
+ let arr = []
+ this.form.budgetList.forEach(item => {
+ if (item.maxamount || item.minamount) {
+ arr.push(item)
+ }
+ })
companyUpdateById({
id: this.form.id,
paramList: this.form.tableData,
@@ -254,7 +266,7 @@
platCateId: this.form.platCateId,
name: this.form.name,
imgurl: this.form.imgurl,
- budgetList: this.form.budgetList
+ budgetList: arr
})
.then(() => {
this.visible = false
diff --git a/company_admin/src/utils/request.js b/company_admin/src/utils/request.js
index bb715e1..51dae67 100644
--- a/company_admin/src/utils/request.js
+++ b/company_admin/src/utils/request.js
@@ -3,6 +3,7 @@
import pkg from '../../package'
import { trim } from './util'
import cache from '../plugins/cache'
+import { Message } from 'element-ui'
axios.defaults.headers.common['Content-Type'] = 'application/json;charset=UTF-8'
const axiosInstance = axios.create({
@@ -40,6 +41,7 @@
// 鏂板缓鍝嶅簲鎷︽埅鍣�
axiosInstance.interceptors.response.use((response) => {
+ console.log(response.status)
// 璇锋眰澶辫触
if (response.status !== 200) {
return Promise.reject(new Error('鏈嶅姟鍣ㄧ箒蹇欙紝璇风◢鍚庡啀璇�'))
diff --git a/company_admin/src/views/business/goods.vue b/company_admin/src/views/business/goods.vue
index 1b081e2..e08df42 100644
--- a/company_admin/src/views/business/goods.vue
+++ b/company_admin/src/views/business/goods.vue
@@ -286,7 +286,9 @@
}).then(res => {
this.$tip.apiSuccess('鏇存柊鎴愬姛')
}).finally(() => {
- // this.search()
+ this.search()
+ }).catch(err => {
+ this.$message.warning({ message: err.message })
})
},
turnNum (nums) {
diff --git a/server/company/src/main/java/com/doumee/api/business/CategoryController.java b/server/company/src/main/java/com/doumee/api/business/CategoryController.java
index 47bf101..9b7ea1c 100644
--- a/server/company/src/main/java/com/doumee/api/business/CategoryController.java
+++ b/server/company/src/main/java/com/doumee/api/business/CategoryController.java
@@ -100,7 +100,6 @@
@RequiresPermissions("business:category:update")
public ApiResponse companyUpdateById(@RequestBody Category category) {
categoryService.companyUpdateById(category);
- cateParamSelectService.dealCateParamSelect();
return ApiResponse.success(null);
}
diff --git a/server/company/src/main/java/com/doumee/config/shiro/ShiroRealm.java b/server/company/src/main/java/com/doumee/config/shiro/ShiroRealm.java
index 657c0e6..1f3e049 100644
--- a/server/company/src/main/java/com/doumee/config/shiro/ShiroRealm.java
+++ b/server/company/src/main/java/com/doumee/config/shiro/ShiroRealm.java
@@ -100,7 +100,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟淇℃伅宸茶绂佺敤锛屽鏈夌枒闂鑱旂郴绯荤粺绠＄悊鍛橈紒");
}
if(DateUtil.compareDate(new Date(),DateUtil.addDaysToDate(company.getOepnValidDate(),1))<=Constants.ZERO){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝浼佷笟淇℃伅宸茶繃鏈燂紝濡傛湁鐤戦棶璇疯仈绯荤郴缁熺鐞嗗憳锛�");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼佷笟璐﹀彿宸茶繃鏈燂紝濡傞渶缁х画浣跨敤锛岃鑱旂郴鎮ㄧ殑涓氬姟缁忕悊");
}
user.setCompany(company);
}
diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
index dee67ff..e323532 100644
--- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemUserBizImpl.java
@@ -114,7 +114,7 @@
queryUserDto.setDeleted(Boolean.FALSE);
SystemUser user = systemUserService.findOne(queryUserDto);
if (user != null) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐢ㄦ埛鍚嶅凡瀛樺湪");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐧诲綍璐﹀彿宸插瓨鍦�");
}
// 楠岃瘉宸ュ彿
if (StringUtils.isNotBlank(systemUser.getEmpNo())) {
@@ -175,7 +175,7 @@
queryUserDto.setDeleted(Boolean.FALSE);
user = systemUserService.findOne(queryUserDto);
if (user != null && !user.getId().equals(systemUser.getId())) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐢ㄦ埛鍚嶅凡瀛樺湪");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐧诲綍璐﹀彿宸插瓨鍦�");
}
}
@@ -250,7 +250,7 @@
queryUserDto.setDeleted(Boolean.FALSE);
SystemUser user = systemUserService.findOne(queryUserDto);
if (user != null) {
- throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐢ㄦ埛鍚嶅凡瀛樺湪");
+ throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "鐧诲綍璐﹀彿宸插瓨鍦�");
}
if(createCompanyUserDTO.getType().equals(Constants.UserType.ZHUBO.getKey())){
Company company = companyService.findById(loginUserInfo.getCompanyId());
@@ -258,8 +258,10 @@
zbUserNum.setCompanyId(loginUserInfo.getCompanyId());
zbUserNum.setDeleted(Boolean.FALSE);
zbUserNum.setType(Constants.UserType.ZHUBO.getKey());
- if(systemUserService.findList(zbUserNum).size()>=company.getUserNum()){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝宸茶秴鍑轰紒涓氬彲鍒嗛厤涓绘挱鏁伴噺锛屽鏈夌枒闂鑱旂郴绯荤粺绠＄悊鍛橈紒");
+ if(!Objects.isNull(company.getUserNum())&&company.getUserNum()!=Constants.ZERO){
+ if(systemUserService.findList(zbUserNum).size()>=company.getUserNum()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝宸茶秴鍑轰紒涓氬彲鍒嗛厤涓绘挱鏁伴噺锛屽鏈夌枒闂鑱旂郴绯荤粺绠＄悊鍛橈紒");
+ }
}
}
SystemUser systemUser = new SystemUser();
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 454a509..5bac46b 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
@@ -399,7 +399,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())
- .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()+" ");
+ .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.ISDELETED = 0 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 02f664f..045762f 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
@@ -153,6 +153,7 @@
QueryWrapper<Brand> wrapper = new QueryWrapper<>(brand);
wrapper.lambda().eq(Brand::getIsdeleted,Constants.ZERO);
// wrapper.lambda().eq(Brand::getStatus,Constants.ZERO);
+ wrapper.lambda().orderByAsc(Brand::getType);
wrapper.lambda().orderByAsc(Brand::getSortnum);
// 绫诲瀷 0浼佷笟 1骞冲彴
if (Constants.equalsInteger(user.getType(), Constants.UserType.SYSTEM.getKey())) {
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
index 237ba6f..1497b58 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CategoryServiceImpl.java
@@ -227,8 +227,8 @@
}
}
- this.dealCateAttr(category.getAttrFirstList(),Constants.ZERO,category.getId(),user);
- this.dealCateAttr(category.getAttrSecondList(),Constants.ONE,category.getId(),user);
+// this.dealCateAttr(category.getAttrFirstList(),Constants.ZERO,category.getId(),user);
+// this.dealCateAttr(category.getAttrSecondList(),Constants.ONE,category.getId(),user);
// cateAttrMapper.delete(new QueryWrapper<CateAttr>().eq("CATEGORY_ID",category.getId()));
// List<CateAttr> attrFirst = category.getAttrFirstList();
// if(!Objects.isNull(attrFirst)&&attrFirst.size()> Constants.ZERO){
@@ -292,20 +292,7 @@
category.setShortPinyin(PinYinUtil.getFirstSpell(category.getName()));
categoryMapper.updateById(category);
//澶勭悊灞炴�ч厤缃�
- cateParamMapper.delete(new QueryWrapper<CateParam>().eq("CATEGORY_ID",category.getId()));
- List<CateParam> paramList = category.getParamList();
- if(!Objects.isNull(paramList)&¶mList.size()> Constants.ZERO){
- for (int i = 0; i < paramList.size(); i++) {
- CateParam cateParam = paramList.get(i);
- cateParam.setCreator(user.getId());
- cateParam.setCreateDate(new Date());
- cateParam.setIsdeleted(Constants.ZERO);
- cateParam.setSortnum(i+Constants.ONE);
- cateParam.setStatus(Constants.ZERO);
- cateParam.setCategoryId(category.getId());
- cateParamMapper.insert(cateParam);
- }
- }
+ this.dealCateParam(category.getParamList(),category.getId(),user);
cateBudgetMapper.delete(new QueryWrapper<CateBudget>().eq("CATEGORY_ID",category.getId()));
List<CateBudget> budgetList = category.getBudgetList();
if(!Objects.isNull(budgetList)&&budgetList.size()> Constants.ZERO){
@@ -323,60 +310,54 @@
}
- public void dealCateAttr(List<CateAttr> cateAttrList,Integer type,Integer categoryId,LoginUserInfo user){
- List<CateAttr> oldCateAttrList = cateAttrMapper.selectList(new QueryWrapper<CateAttr>().eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",categoryId).eq("TYPE",type));
- List<CateAttr> addCateAttr = new ArrayList<>();
- List<CateAttr> updCateAttr = new ArrayList<>();
- List<CateAttr> delCateAttr = new ArrayList<>();
- for (CateAttr oldCateAttr:oldCateAttrList) {
+ public void dealCateParam(List<CateParam> cateParamList,Integer categoryId,LoginUserInfo userInfo ){
+ List<CateParam> oldCateParamList = cateParamMapper.selectList(new QueryWrapper<CateParam>()
+ .eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",categoryId));
+ List<CateParam> updCateParam = new ArrayList<>();
+ List<CateParam> delCateParam = new ArrayList<>();
+ for (CateParam oldCateParam:oldCateParamList) {
Boolean flag = false;
- for (CateAttr cateAttr:cateAttrList) {
- if(oldCateAttr.getName().equals(cateAttr.getName())){
- updCateAttr.add(oldCateAttr);
+ for (CateParam cateParam:cateParamList) {
+ if(oldCateParam.getId().equals(cateParam.getId())){
+ updCateParam.add(cateParam);
flag = true;
break;
}
}
if(!flag){
- delCateAttr.add(oldCateAttr);
+ delCateParam.add(oldCateParam);
}
}
- CateAttr maxCateAttr = cateAttrMapper.selectOne(new QueryWrapper<CateAttr>().eq("ISDELETED",Constants.ZERO).eq("CATEGORY_ID",categoryId).eq("TYPE",type).orderByDesc(" SORTNUM ").last(" limit 1 "));
+ CateParam maxCateParam = cateParamMapper.selectOne(new QueryWrapper<CateParam>().eq("ISDELETED",Constants.ZERO)
+ .eq("CATEGORY_ID",categoryId).orderByDesc(" SORTNUM ").last(" limit 1 "));
Integer nextSortNum = 0;
- if(!Objects.isNull(maxCateAttr)){
- nextSortNum = maxCateAttr.getSortnum();
+ if(!Objects.isNull(maxCateParam)){
+ nextSortNum = maxCateParam.getSortnum();
}
- //澶勭悊鏂板鏁版嵁
- for (CateAttr cateAttr:cateAttrList) {
- Boolean flag = false;
- for (CateAttr oldCateAttr:oldCateAttrList) {
- if(cateAttr.getName().equals(oldCateAttr.getName())){
- flag = true;
- break;
- }
- }
- if(!flag){
- nextSortNum = nextSortNum + 1;
- cateAttr.setCreator(user.getId());
- cateAttr.setCreateDate(new Date());
- cateAttr.setIsdeleted(Constants.ZERO);
- cateAttr.setSortnum(nextSortNum);
- cateAttr.setStatus(Constants.ZERO);
- cateAttr.setCategoryId(categoryId);
- cateAttr.setType(type);
- addCateAttr.add(cateAttr);
+ for (CateParam cateParam:cateParamList) {
+ if(Objects.isNull(cateParam.getId())){
+ nextSortNum ++ ;
+ cateParam.setCreator(userInfo.getId());
+ cateParam.setCreateDate(new Date());
+ cateParam.setIsdeleted(Constants.ZERO);
+ cateParam.setSortnum(nextSortNum);
+ cateParam.setStatus(Constants.ZERO);
+ cateParam.setCategoryId(categoryId);
+ cateParamMapper.insert(cateParam);
}
}
- addCateAttr.forEach(i->{
- cateAttrMapper.insert(i);
+ delCateParam.forEach(i->{
+ cateParamMapper.deleteById(i.getId());
});
- delCateAttr.forEach(i->{
- i.setIsdeleted(Constants.ONE);
+ updCateParam.forEach(i->{
i.setEditDate(new Date());
- i.setEditor(user.getId());
- cateAttrMapper.updateById(i);
+ i.setEditor(userInfo.getId());
+ cateParamMapper.updateById(i);
});
+
+
}
+
@Override
public void updateDisableById(Category category) {
@@ -451,9 +432,8 @@
+ 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 ")));
+ c.setBudgetList(cateBudgetMapper.selectList(new QueryWrapper<CateBudget>().eq("CATEGORY_ID",c.getId())
+ .orderByAsc(" SORTNUM ")));
this.getParamSelect(c);
}
return list;
@@ -465,6 +445,7 @@
.eq("CATEGORY_ID",category.getId())
.eq("ISSELECT",Constants.ONE)
.eq("ISDELETED",Constants.ZERO)
+ .eq("ISSHOW",Constants.ONE)
.orderByAsc(" SORTNUM ")
.last(" limit 2 ")
);
@@ -504,8 +485,12 @@
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.setParamList(cateParamMapper.selectList(new QueryWrapper<CateParam>()
- .select(" * , ( select gp.VAL from goods_param gp where gp.GOODS_ID = "+goodsId+" and gp.PRAMA_ID = cate_param.id limit 1 ) as val ")
- .eq("CATEGORY_ID",c.getId()).orderByAsc(" SORTNUM ")));
+ .select(" * , ( select gp.VAL from goods_param gp where gp.GOODS_ID = "+goodsId+" and gp.PRAMA_ID = cate_param.id limit 1 ) as val ")
+ .eq("CATEGORY_ID",c.getId())
+ .eq("ISSHOW",Constants.ONE)
+ .eq("STATUS",Constants.ZERO)
+ .eq("ISDELETED",Constants.ZERO)
+ .orderByAsc(" SORTNUM ")));
}
return list;
}
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 bb7ec36..394b42a 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
@@ -229,6 +229,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;
@@ -284,16 +285,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);
}
@@ -329,6 +330,7 @@
multifile.setObjId(goods.getId());
multifile.setType(Constants.ZERO);
multifile.setObjType(Constants.ZERO);
+ multifile.setCompanyId(goods.getCompanyId());
multifileMapper.insert(multifile);
}
}
@@ -343,20 +345,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();
@@ -441,7 +429,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);
@@ -465,6 +454,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);
}
@@ -519,7 +509,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(),"鏈煡璇㈠埌骞冲彴鍟嗗搧淇℃伅");
@@ -557,7 +547,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++;
@@ -1075,7 +1065,9 @@
goodsIPage.getRecords().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())
+ .orderByAsc(" SORTNUM ")));
});
return PageData.from(goodsIPage);
}
@@ -1117,7 +1109,10 @@
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;
}
diff --git a/server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java b/server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java
index 71e7cfa..59d7d66 100644
--- a/server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/impl/CateParamSelectServiceImpl.java
@@ -168,7 +168,7 @@
//鏂板褰撳墠浼佷笟鍙互浣跨敤鐨勬暟鎹�
cateParamSelectMapper.insertBatch(loginUserInfo.getCompanyId(),loginUserInfo.getId());
}catch (Exception e){
-
+ e.printStackTrace();
}finally {
redisTemplate.opsForValue().set(loginUserInfo.getCompanyId()+Constants.CATE_PARAM_OPEN,false);
}
--
Gitblit v1.9.3