From 64f45c75ea93911b9841bf00bb4c436cd294be3a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 18:30:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java
index 7b3b4f1..0cb6e60 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java
@@ -74,9 +74,10 @@
baseCategory2.setImgurl(baseCategory.getImgurl());
baseCategory2.setPinyin(baseCategory.getPinyin());
baseCategory2.setShortPinyin(baseCategory.getShortPinyin());
+ baseCategory2.setPriceRate(baseCategory.getPriceRate());
baseCategoryMapper.insert(baseCategory2);
- if (CollectionUtils.isEmpty(baseCategory.getBaseCategoryRequestParamList())){
+ if (!CollectionUtils.isEmpty(baseCategory.getBaseCategoryRequestParamList())){
long count = baseCategory.getBaseCategoryRequestParamList().stream().map(s -> s.getName().trim()).distinct().count();
@@ -122,11 +123,11 @@
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@Override
- public void updateById(BaseCategoryRequest baseCategory) {
+ public void update(BaseCategoryRequest baseCategory) {
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
- if (Objects.nonNull(baseCategory.getId())){
+ if (Objects.isNull(baseCategory.getId())){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鍝佺被涓婚敭缂哄け");
}
@@ -144,10 +145,11 @@
.eq(BaseCategory::getId,baseCategory.getId())
.set(BaseCategory::getName,baseCategory.getName())
.set(BaseCategory::getImgurl,baseCategory.getImgurl())
+ .set(BaseCategory::getPriceRate,baseCategory.getPriceRate())
.set(BaseCategory::getSortnum,baseCategory.getSortnum());
- baseCategoryMapper.update(null,wrapper);
+ baseCategoryMapper.update(null,updateWrapper);
- if (CollectionUtils.isEmpty(baseCategory.getBaseCategoryRequestParamList())){
+ if (!CollectionUtils.isEmpty(baseCategory.getBaseCategoryRequestParamList())){
long count = baseCategory.getBaseCategoryRequestParamList().stream().map(s -> s.getName().trim()).distinct().count();
if (baseCategory.getBaseCategoryRequestParamList().size() != count){
@@ -207,7 +209,14 @@
@Override
public List<BaseCategory> findList(BaseCategory baseCategory) {
QueryWrapper<BaseCategory> wrapper = new QueryWrapper<>(baseCategory);
- return baseCategoryMapper.selectList(wrapper);
+ List<BaseCategory> list = baseCategoryMapper.selectList(wrapper);
+ list.forEach(i->{
+ i.setImgfullurl(
+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.RESOURCE_PATH).getCode() +
+ systemDictDataBiz.queryByCode(Constants.OSS,Constants.CATEGORY_IMG).getCode() + i.getImgurl()
+ );
+ });
+ return list;
}
@Override
@@ -266,7 +275,7 @@
IPage<BaseCategory> baseCategoryIPage = baseCategoryMapper.selectPage(page, queryWrapper);
if (!CollectionUtils.isEmpty(baseCategoryIPage.getRecords())){
- baseCategoryIPage.getRecords().forEach(s->s.setImgfullurl(getPreUrl()+s.getImgfullurl()));
+ baseCategoryIPage.getRecords().forEach(s->s.setImgfullurl(getPreUrl()+s.getImgurl()));
}
return PageData.from(baseCategoryIPage);
--
Gitblit v1.9.3