From c681ae8c728244d20235ba82dd510ffa161ab66d Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Feb 2023 10:31:02 +0800
Subject: [PATCH] 商品现价改成折扣价 隐藏了成本价 重量的备注设置为克

---
 src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java |   94 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 91 insertions(+), 3 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 9dd068a..8769c64 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
@@ -5,15 +5,19 @@
 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;
@@ -38,6 +42,7 @@
 public class AdminMallGoodsController extends BaseController {
 
     private final IAdminMallGoodsService adminMallGoodsService;
+    private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
 
     /**
      *  图片上传
@@ -162,5 +167,88 @@
         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