From 4e88d81927a660254005ff247ea79a42616388b4 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 04 Aug 2022 17:32:01 +0800 Subject: [PATCH] 20220804 配送限制 --- src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 48 insertions(+), 0 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..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,15 +5,21 @@ 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; @@ -38,6 +44,7 @@ public class AdminMallGoodsController extends BaseController { private final IAdminMallGoodsService adminMallGoodsService; + private final DataDictionaryCustomMapper dataDictionaryCustomMapper; /** * 图片上传 @@ -162,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