From 89ff1d1668c471c293dedd312a4eb98a6ebfd06d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 18 Aug 2022 16:51:47 +0800
Subject: [PATCH] 20220810

---
 src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java |   70 ++++++++++++++++++++++++++++++++++
 1 files changed, 69 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 03f0a91..567ff86 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
@@ -5,16 +5,23 @@
 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.RankAwardUpdateDto;
 import cc.mrbird.febs.mall.dto.UpMallGoodsDto;
+import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
 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 org.springframework.validation.annotation.Validated;
@@ -37,6 +44,7 @@
 public class AdminMallGoodsController extends BaseController {
 
     private final IAdminMallGoodsService adminMallGoodsService;
+    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
 
     /**
      *  图片上传
@@ -58,7 +66,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);
@@ -94,6 +103,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);
     }
 
     /**
@@ -142,5 +169,46 @@
         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);
+    }
+
 
 }

--
Gitblit v1.9.1