From c619972c50577bb699be6ee099b5e2741882fabb Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 27 Dec 2023 16:15:59 +0800
Subject: [PATCH] 直推奖励，冻结的用户，则直推奖励销毁，用户未冻结才能领取成功
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java | 147 ++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 140 insertions(+), 7 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 8e8f1d1..5dcd755 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,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;
@@ -20,8 +30,10 @@
import sun.misc.BASE64Encoder;
import javax.validation.Valid;
+import javax.validation.constraints.NotNull;
import java.io.IOException;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Slf4j
@@ -32,6 +44,7 @@
public class AdminMallGoodsController extends BaseController {
private final IAdminMallGoodsService adminMallGoodsService;
+ private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
/**
* 图片上传
@@ -53,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);
@@ -82,6 +96,36 @@
return new FebsResponse().success().data(data);
}
+
+ /**
+ * app商品列表
+ * @param mallGoods
+ * @param request
+ * @return
+ */
+ @GetMapping("goodsAppList")
+ public FebsResponse goodsAppList(MallGoods mallGoods, QueryRequest request) {
+ Map<String, Object> data = getDataTable(adminMallGoodsService.getAppCategoryListInPage(mallGoods, request));
+ return new FebsResponse().success().data(data);
+ }
+ /**
+ * app商品-新增
+ */
+ @PostMapping("addMallAppGoods")
+ @ControllerEndpoint(operation = " 商品-新增", exceptionMessage = "新增失败")
+ public FebsResponse addMallAppGoods(@RequestBody @Valid AddMallGoodsDto addMallGoodsDto) {
+ return adminMallGoodsService.addMallAppGoods(addMallGoodsDto);
+ }
+
+ /**
+ * app商品-编辑
+ */
+ @PostMapping("updateAppMallGoods")
+ @ControllerEndpoint(operation = "商品-编辑", exceptionMessage = "操作失败")
+ public FebsResponse updateAppMallGoods(@RequestBody @Valid MallGoodsUpdateDto mallGoodsUpdateDto) {
+ return adminMallGoodsService.updateAppMallGoods(mallGoodsUpdateDto);
+ }
+
/**
* 商品-新增
*/
@@ -92,20 +136,109 @@
}
/**
+ * 商品-热卖
+ */
+ @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);
+ }
+
+ /**
* 商品-上架
*/
- @PostMapping("upMallGoods")
+ @GetMapping("upMallGoods/{id}")
@ControllerEndpoint(operation = " 商品-上架", exceptionMessage = "上架失败")
- public FebsResponse upMallGoods(@RequestBody @Valid UpMallGoodsDto upMallGoodsDto) {
- return adminMallGoodsService.upMallGoods(upMallGoodsDto);
+ public FebsResponse upMallGoods(@NotNull(message = "{required}") @PathVariable Long id) {
+ return adminMallGoodsService.upMallGoods(id);
}
/**
* 商品-下架
*/
- @PostMapping("downMallGoods")
+ @GetMapping("downMallGoods/{id}")
@ControllerEndpoint(operation = " 商品-下架", exceptionMessage = "下架失败")
- public FebsResponse downMallGoods(@RequestBody @Valid UpMallGoodsDto upMallGoodsDto) {
- return adminMallGoodsService.downMallGoods(upMallGoodsDto);
+ public FebsResponse downMallGoods(@NotNull(message = "{required}") @PathVariable Long id) {
+ return adminMallGoodsService.downMallGoods(id);
}
+
+ /**
+ * 商品-删除
+ */
+ @GetMapping("delMallGoods/{id}")
+ @ControllerEndpoint(operation = " 商品-删除", exceptionMessage = "删除失败")
+ public FebsResponse delMallGoods(@NotNull(message = "{required}") @PathVariable Long id) {
+ return adminMallGoodsService.delMallGoods(id);
+ }
+
+
+ /**
+ * 商品-编辑
+ */
+ @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);
+ }
+
+
}
--
Gitblit v1.9.1