From 0b3393b2485ef1905f44356e26f5cc1a48be9a83 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 21 May 2023 19:52:09 +0800
Subject: [PATCH] 正式环境

---
 src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java |  176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 166 insertions(+), 10 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..43bb0c9 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
@@ -5,25 +5,37 @@
 import cc.mrbird.febs.common.controller.BaseController;
 import cc.mrbird.febs.common.entity.FebsResponse;
 import cc.mrbird.febs.common.entity.QueryRequest;
+import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
 import cc.mrbird.febs.common.utils.OssUtils;
-import cc.mrbird.febs.mall.dto.AddMallGoodsDto;
-import cc.mrbird.febs.mall.dto.MallGoodsUpdateDto;
-import cc.mrbird.febs.mall.dto.UpMallGoodsDto;
+import cc.mrbird.febs.mall.dto.*;
+import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
+import cc.mrbird.febs.mall.entity.MallCarriageRule;
 import cc.mrbird.febs.mall.entity.MallGoods;
 import cc.mrbird.febs.mall.entity.MallGoodsCategory;
+import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
 import cc.mrbird.febs.mall.service.IAdminMallGoodsService;
+import cc.mrbird.febs.mall.vo.AdminHomeDeliverySettingVo;
+import cc.mrbird.febs.mall.vo.AdminMallGoodsCategoryTreeVo;
+import cc.mrbird.febs.mall.vo.AdminMallGoodsTreeVo;
+import cc.mrbird.febs.mall.vo.AdminRangeSettingVo;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import net.coobird.thumbnailator.Thumbnails;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import sun.misc.BASE64Encoder;
 
+import javax.imageio.ImageIO;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
-import java.io.IOException;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import java.net.URLEncoder;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Slf4j
@@ -34,6 +46,7 @@
 public class AdminMallGoodsController extends BaseController {
 
     private final IAdminMallGoodsService adminMallGoodsService;
+    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
 
     /**
      *  图片上传
@@ -46,16 +59,36 @@
             new FebsResponse().message("上传文件为空");
         }
 
-        //文件加密
-        BASE64Encoder base64Encoder =new BASE64Encoder();
-        String base64EncoderImg = null;
+        String base64EncoderImg = "";
         try {
-            base64EncoderImg = base64Encoder.encode(file.getBytes());
-        } catch (IOException e) {
+            //输出到BufferedImage
+            BufferedImage bufferedImage = Thumbnails.of(file.getInputStream())
+                    // 图片大小(长宽)压缩比例 从0-1,1表示原图
+                    .scale(1f)
+                    // 图片质量压缩比例 从0-1,越接近1质量越好
+                    .outputQuality(0.5f)
+                    .asBufferedImage();
+            //对内存中的图片文件进行Base64处理
+            ByteArrayOutputStream newBaos = new ByteArrayOutputStream();//io流
+            ImageIO.write(bufferedImage, "jpg", newBaos);//写入流中
+            byte[] bytes = newBaos.toByteArray();//转换成字节
+            base64EncoderImg = new BASE64Encoder().encode(bytes);
+//            base64EncoderImg = URLEncoder.encode(new BASE64Encoder().encode(bytes), "UTF-8");
+        } catch (Exception e) {
             e.printStackTrace();
         }
 
-        String imageFuffix = ".png";
+
+        //文件加密
+//        BASE64Encoder base64Encoder =new BASE64Encoder();
+//        try {
+//            base64EncoderImg = base64Encoder.encode(file.getBytes());
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
+
+        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);
@@ -70,6 +103,19 @@
         map2.put("src",url);//图片url
         map2.put("title",imageNames);//图片名称,这个会显示在输入框里
         return map;
+    }
+
+    public String Base64ImageByMemory(BufferedImage pic) {
+        String imgString = "";
+        ByteArrayOutputStream newBaos = new ByteArrayOutputStream();//io流
+        try {
+            ImageIO.write(pic, "jpg", newBaos);//写入流中
+            byte[] bytes = newBaos.toByteArray();//转换成字节
+            imgString = URLEncoder.encode(new BASE64Encoder().encode(bytes), "UTF-8");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return imgString;
     }
 
     /**
@@ -91,6 +137,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 +194,97 @@
         return adminMallGoodsService.updateMallGoods(mallGoodsUpdateDto);
     }
 
+    /**
+     * 商品-全部选择
+     */
+    @GetMapping("goods/allTree")
+    @ControllerEndpoint(exceptionMessage = "获取商品失败")
+    public List<AdminMallGoodsTreeVo> getAllGoodsTree(){
+        return adminMallGoodsService.getAllGoodsTree();
+    }
+
+    /**
+     * 商品配送设置 -- 更新
+     */
+    @PostMapping(value = "/deliverySetUpdate")
+    public FebsResponse deliverySetUpdate(AdminRangeSettingVo adminRangeSettingVo) {
+        Integer rangeSwitch = adminRangeSettingVo.getRangeSwitch();
+        DataDictionaryCustom rangeSwitchDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RANGE_SWITCH.getType(), DataDictionaryEnum.RANGE_SWITCH.getCode());
+        rangeSwitchDic.setValue(rangeSwitch.toString());
+        dataDictionaryCustomMapper.updateById(rangeSwitchDic);
+
+        Integer rangeSize = adminRangeSettingVo.getRangeSize();
+        DataDictionaryCustom rangeSizeDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.RANGE_SIZE.getType(), DataDictionaryEnum.RANGE_SIZE.getCode());
+        rangeSizeDic.setValue(rangeSize.toString());
+        dataDictionaryCustomMapper.updateById(rangeSizeDic);
+
+        Double homeDeliveryAmount = adminRangeSettingVo.getHomeDeliveryAmount();
+        DataDictionaryCustom homeDeliveryAmountDic = dataDictionaryCustomMapper.selectDicDataByTypeAndCode(DataDictionaryEnum.HOME_DELIVERY_AMOUNT.getType(), DataDictionaryEnum.HOME_DELIVERY_AMOUNT.getCode());
+        homeDeliveryAmountDic.setValue(homeDeliveryAmount.toString());
+        dataDictionaryCustomMapper.updateById(homeDeliveryAmountDic);
+
+        return new FebsResponse().success();
+    }
+
+    /**
+     * 配送费列表
+     */
+    @GetMapping("deliveryHomeList")
+    public FebsResponse deliveryHomeList(AdminHomeDeliverySettingVo adminHomeDeliverySettingVo, QueryRequest request) {
+        Map<String, Object> data = getDataTable(adminMallGoodsService.getDeliveryHomeListInPage(adminHomeDeliverySettingVo, request));
+        return new FebsResponse().success().data(data);
+    }
+
+    /**
+     * 配送费列表-更新
+     */
+    @PostMapping("deliveryHomeUpdate")
+    @ControllerEndpoint(operation = "配送费列表-更新", exceptionMessage = "操作失败")
+    public FebsResponse deliveryHomeUpdate(@Valid AdminHomeDeliverySettingVo adminHomeDeliverySettingVo) {
+        return adminMallGoodsService.deliveryHomeUpdate(adminHomeDeliverySettingVo);
+    }
+
+    /**
+     * 运费模板列表
+     */
+    @GetMapping("carriageRuleList")
+    public FebsResponse carriageRuleList(MallCarriageRule mallCarriageRule, QueryRequest request) {
+        Map<String, Object> data = getDataTable(adminMallGoodsService.getMallCarriageRuleListInPage(mallCarriageRule, request));
+        return new FebsResponse().success().data(data);
+    }
+
+    /**
+     * 运费模板列表-删除
+     */
+    @GetMapping("carriageRuleDel/{id}")
+    @ControllerEndpoint(operation = "运费模板列表-删除", exceptionMessage = "操作失败")
+    public FebsResponse carriageRuleDel(@NotNull(message = "{required}") @PathVariable Long id) {
+        return adminMallGoodsService.carriageRuleDelById(id);
+    }
+
+    /**
+     * 运费模板列表-新增
+     */
+    @PostMapping("carriageRuleAdd")
+    @ControllerEndpoint(operation = " 商品-新增", exceptionMessage = "操作失败")
+    public FebsResponse carriageRuleAdd(@RequestBody @Valid AdminCarriageRuleAddDto adminCarriageRuleAddDto) {
+        return adminMallGoodsService.carriageRuleAdd(adminCarriageRuleAddDto);
+    }
+
+
+    /**
+     * 运费模板列表-更新
+     */
+    @PostMapping("carriageRuleUpdate")
+    @ControllerEndpoint(operation = "运费模板列表-更新", exceptionMessage = "操作失败")
+    public FebsResponse carriageRuleUpdate(@RequestBody @Valid AdminCarriageRuleUpdateDto adminCarriageRuleUpdateDto) {
+        return adminMallGoodsService.carriageRuleUpdate(adminCarriageRuleUpdateDto);
+    }
+
+    @GetMapping(value = "/carriageRuleTree")
+    public FebsResponse carriageRuleTree() {
+        return new FebsResponse().success().data(adminMallGoodsService.findAllCarriageRuleTree());
+    }
+
 
 }

--
Gitblit v1.9.1