From 0b9c144b5110a7e2a85b2e5581ef304bb81a3ebc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 19 九月 2023 19:24:35 +0800
Subject: [PATCH] 修改
---
server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 89 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 74 insertions(+), 15 deletions(-)
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 bfd5feb..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
@@ -11,11 +11,13 @@
import com.doumee.dao.business.BrandMapper;
import com.doumee.dao.business.model.Brand;
import com.doumee.dao.business.model.Category;
+import com.doumee.dao.business.model.Goods;
import com.doumee.service.business.BrandService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -40,10 +42,27 @@
private SystemDictDataBiz systemDictDataBiz;
@Override
public Integer create(Brand brand) {
+ if(StringUtils.isBlank(brand.getName())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(brandMapper.selectCount(new QueryWrapper<Brand>().eq("ISDELETED",Constants.ZERO).eq("name",brand.getName()))>0){
+ if(brandMapper.selectCount(new QueryWrapper<Brand>()
+ .eq("ISDELETED",Constants.ZERO)
+ .eq(user.getType().equals(Constants.UserType.SYSTEM.getKey()),"name",brand.getName())
+ .and(user.getType().equals(Constants.UserType.COMPANY.getKey()),
+ i->i.apply(" name = '"+brand.getName()+"' and type = 1 ")
+ .or().apply( " name = '"+brand.getName()+"' and COMPANY_ID = '"+user.getCompanyId()+"' and type = 0 ")
+ )
+ )>0){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+brand.getName()+"銆戝凡瀛樺湪");
- };
+ }
+ if(Constants.equalsInteger(user.getType(), Constants.UserType.SYSTEM.getKey())){
+ //骞冲彴鍝佺墝
+ brand.setType(Constants.ONE);
+ }else{
+ brand.setType(Constants.ZERO);
+ brand.setCompanyId(user.getCompanyId());
+ }
brand.setStatus(Constants.ZERO);
brand.setCreateDate(new Date());
brand.setCreator(user.getId());
@@ -79,9 +98,21 @@
@Override
public void updateById(Brand brand) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
- if(brandMapper.selectCount(new QueryWrapper<Brand>().eq("ISDELETED",Constants.ZERO).ne("id",brand.getId()).eq("name",brand.getName()))>0){
+
+ Brand brand1 = brandMapper.selectOne(new QueryWrapper<Brand>()
+ .eq("ISDELETED", Constants.ZERO)
+ .eq(user.getType().equals(Constants.UserType.SYSTEM.getKey()), "name", brand.getName())
+ .and(user.getType().equals(Constants.UserType.COMPANY.getKey()),
+ i -> i.apply(" name = '" + brand.getName() + "' and type = 1 ")
+ .or().apply(" name = '" + brand.getName() + "' and COMPANY_ID = '" + user.getCompanyId() + "' and type = 0 ")
+ ).last("limit 1")
+ );
+
+ if(Objects.nonNull(brand1) && (!brand.getId().equals(brand.getId()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"銆�"+brand.getName()+"銆戝凡瀛樺湪");
- };
+ }
+ brand.setType(null);
+ brand.setCompanyId(null);
brand.setStatus(Constants.ZERO);
brand.setEditDate(new Date());
brand.setEditor(user.getId());
@@ -101,10 +132,12 @@
@Override
public Brand findById(Integer id) {
- String prefixUrl = systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.FILE_DIR).getCode()
- + systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
Brand brand = brandMapper.selectById(id);
- brand.setPrefixUrl(prefixUrl);
+ if(StringUtils.isNotBlank(brand.getImgurl())){
+ String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(Constants.OSS, Constants.BRAND_IMG).getCode();
+ brand.setImgfullurl(prefixUrl+brand.getImgurl());
+ }
return brand;
}
@@ -116,21 +149,33 @@
@Override
public List<Brand> findList(Brand brand) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
QueryWrapper<Brand> wrapper = new QueryWrapper<>(brand);
wrapper.lambda().eq(Brand::getIsdeleted,Constants.ZERO);
- wrapper.lambda().eq(Brand::getStatus,Constants.ZERO);
+// wrapper.lambda().eq(Brand::getStatus,Constants.ZERO);
wrapper.lambda().orderByAsc(Brand::getSortnum);
+ // 绫诲瀷 0浼佷笟 1骞冲彴
+ if (Constants.equalsInteger(user.getType(), Constants.UserType.SYSTEM.getKey())) {
+ wrapper.lambda().eq(Brand::getType,Constants.ONE);
+ }else {
+ wrapper.lambda().and(i->i.eq(Brand::getCompanyId,user.getCompanyId())
+ .or().eq(Brand::getType,Constants.ONE)
+ );
+ }
List<Brand> list = brandMapper.selectList(wrapper);
- 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.BRAND_IMG).getCode();
for (Brand b:list) {
- b.setPrefixUrl(prefixUrl);
+ if(StringUtils.isNotBlank(b.getImgurl())){
+ b.setImgfullurl(prefixUrl+b.getImgurl());
+ }
}
return list;
}
-
+
@Override
public PageData<Brand> findPage(PageWrap<Brand> pageWrap) {
+ LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
IPage<Brand> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
QueryWrapper<Brand> queryWrapper = new QueryWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
@@ -141,12 +186,26 @@
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.lambda().eq(Brand::getStatus, pageWrap.getModel().getStatus());
}
+ if (pageWrap.getModel().getType() != null) {
+ queryWrapper.lambda().eq(Brand::getType, pageWrap.getModel().getType());
+ }
+ // 绫诲瀷 0浼佷笟 1骞冲彴
+ if (Objects.isNull(user.getCompanyId())) {
+ queryWrapper.lambda().eq(Brand::getType,Constants.ONE);
+ }else {
+ queryWrapper.lambda().and(i->i.eq(Brand::getCompanyId,user.getCompanyId())
+ .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.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.BRAND_IMG).getCode();
brandIPage.getRecords().forEach(i->{
- i.setPrefixUrl(prefixUrl);
+ if(StringUtils.isNotBlank(i.getImgurl())){
+ i.setImgfullurl(prefixUrl+i.getImgurl());
+ }
});
return PageData.from(brandIPage);
}
--
Gitblit v1.9.3