From 38a7fc9d1a7a421741ef641303ac8d2a78d997f5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 17 Jun 2022 17:57:53 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
index 303bb24..7a742cd 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
@@ -12,7 +12,10 @@
import cc.mrbird.febs.mall.entity.MallGoods;
import cc.mrbird.febs.mall.entity.MallGoodsCategory;
import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
+import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryTreeVo;
+import cc.mrbird.febs.mall.vo.AdminMallGoodsTreeVo;
import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.validation.annotation.Validated;
@@ -24,6 +27,7 @@
import javax.validation.constraints.NotNull;
import java.io.IOException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Slf4j
@@ -55,7 +59,8 @@
e.printStackTrace();
}
- String imageFuffix = ".png";
+ String imageFuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+// String imageFuffix = ".png";
String imageNames = System.currentTimeMillis() + IdUtil.simpleUUID() + imageFuffix;
String imageName = "uploadeFile/" + imageNames;
OssUtils.uploadFileWithBase64(base64EncoderImg, imageName);
@@ -130,5 +135,14 @@
return adminMallGoodsService.updateMallGoods(mallGoodsUpdateDto);
}
+ /**
+ * 商品-全部选择
+ */
+ @GetMapping("goods/allTree")
+ @ControllerEndpoint(exceptionMessage = "获取商品失败")
+ public List<AdminMallGoodsTreeVo> getAllGoodsTree(){
+ return adminMallGoodsService.getAllGoodsTree();
+ }
+
}
--
Gitblit v1.9.1