From 6e930b85e4ef92a0a6170cbb8f2da930bbcc72e9 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Thu, 02 Mar 2023 15:57:51 +0800 Subject: [PATCH] 增加活动公告 --- src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java | 137 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 134 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 f71ae2c..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,13 +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.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 org.springframework.validation.annotation.Validated; @@ -23,6 +31,7 @@ import javax.validation.constraints.NotNull; import java.io.IOException; import java.util.HashMap; +import java.util.List; import java.util.Map; @Slf4j @@ -33,6 +42,7 @@ public class AdminMallGoodsController extends BaseController { private final IAdminMallGoodsService adminMallGoodsService; + private final DataDictionaryCustomMapper dataDictionaryCustomMapper; /** * 图片上传 @@ -54,7 +64,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); @@ -93,6 +104,24 @@ } /** + * 商品-热卖 + */ + @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); + } + + /** * 商品-上架 */ @GetMapping("upMallGoods/{id}") @@ -120,4 +149,106 @@ } + /** + * 商品-编辑 + */ + @PostMapping("updateMallGoods") + @ControllerEndpoint(operation = "商品-编辑", exceptionMessage = "操作失败") + public FebsResponse updateMallGoods(@RequestBody @Valid MallGoodsUpdateDto mallGoodsUpdateDto) { + 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