From 6e966db875e761da1ed1159d3231f69ffc85979e Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 14 Jan 2026 17:39:52 +0800
Subject: [PATCH] fix(mall): 修复商品图片上传功能

---
 src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java |   49 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 45 insertions(+), 4 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..d0693df 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;
@@ -23,7 +26,9 @@
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.io.IOException;
+import java.util.Base64;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -47,19 +52,28 @@
         }
 
         //文件加密
-        BASE64Encoder base64Encoder =new BASE64Encoder();
+//        BASE64Encoder base64Encoder =new BASE64Encoder();
+//        String base64EncoderImg = null;
+//        try {
+//            base64EncoderImg = base64Encoder.encode(file.getBytes());
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+
+        //文件加密
         String base64EncoderImg = null;
         try {
-            base64EncoderImg = base64Encoder.encode(file.getBytes());
+            base64EncoderImg = Base64.getEncoder().encodeToString(file.getBytes());
         } catch (IOException e) {
             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);
-        String bucket_name ="https://excoin.oss-cn-hangzhou.aliyuncs.com";
+        String bucket_name ="https://meiao-1517.oss-cn-shenzhen.aliyuncs.com";
         String url = bucket_name + "/" + imageName;
 
         Map<String,Object> map = new HashMap<String,Object>();
@@ -91,6 +105,24 @@
     @ControllerEndpoint(operation = " 商品-新增", exceptionMessage = "新增失败")
     public FebsResponse addMallGoods(@RequestBody @Valid AddMallGoodsDto addMallGoodsDto) {
         return adminMallGoodsService.addMallGoods(addMallGoodsDto);
+    }
+
+    /**
+     * 商品-热卖
+     */
+    @GetMapping("goodsHot/{id}")
+    @ControllerEndpoint(operation = " 商品-热卖", exceptionMessage = "设置失败")
+    public FebsResponse goodsHot(@NotNull(message = "{required}") @PathVariable Long id) {
+        return adminMallGoodsService.goodsHot(id);
+    }
+
+    /**
+     * 商品-取消热卖
+     */
+    @GetMapping("goodsNotHot/{id}")
+    @ControllerEndpoint(operation = " 商品-取消热卖", exceptionMessage = "设置失败")
+    public FebsResponse goodsNotHot(@NotNull(message = "{required}") @PathVariable Long id) {
+        return adminMallGoodsService.goodsNotHot(id);
     }
 
     /**
@@ -130,5 +162,14 @@
         return adminMallGoodsService.updateMallGoods(mallGoodsUpdateDto);
     }
 
+    /**
+     * 商品-全部选择
+     */
+    @GetMapping("goods/allTree")
+    @ControllerEndpoint(exceptionMessage = "获取商品失败")
+    public List<AdminMallGoodsTreeVo> getAllGoodsTree(){
+        return adminMallGoodsService.getAllGoodsTree();
+    }
+
 
 }

--
Gitblit v1.9.1