From 5fa9999fd5b8b53fa4eb8f534c7335c68e04059d Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 15 九月 2023 17:37:36 +0800
Subject: [PATCH] #联调修改

---
 server/service/src/main/java/com/doumee/service/business/impl/BaseCategoryServiceImpl.java |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 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..32f7fd8 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){
@@ -266,7 +268,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