From e12b33379eccfeead532f677a99c7f9e41e34a0d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Mon, 28 Apr 2025 16:13:33 +0800
Subject: [PATCH] refactor(mall): 重构活动订单核销接口并添加取消订单功能
---
src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java | 267 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 217 insertions(+), 50 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 7e827f2..428afbf 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/AdminMallGoodsController.java
@@ -6,20 +6,20 @@
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.FileUtil;
import cc.mrbird.febs.common.utils.OssUtils;
import cc.mrbird.febs.mall.dto.*;
import cc.mrbird.febs.mall.entity.*;
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 cc.mrbird.febs.mall.vo.*;
+import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.coobird.thumbnailator.Thumbnails;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -45,62 +45,168 @@
private final IAdminMallGoodsService adminMallGoodsService;
private final DataDictionaryCustomMapper dataDictionaryCustomMapper;
+// /**
+// * 图片上传
+// * @return
+// */
+// @PostMapping(value = "/uploadFileBase64")
+// @ControllerEndpoint(operation = "图片上传", exceptionMessage = "上传失败")
+// public Map<String,Object> uploadFileBase64(@RequestBody @Validated MultipartFile file) {
+// if (file.isEmpty()) {
+// new FebsResponse().message("上传文件为空");
+// }
+//
+// String base64EncoderImg = "";
+// try {
+// //输出到BufferedImage
+// BufferedImage bufferedImage = Thumbnails.of(file.getInputStream())
+// // 图片大小（长宽）压缩比例 从0-1，1表示原图
+// .scale(1f)
+// // 图片质量压缩比例 从0-1，越接近1质量越好
+// .outputQuality(0.5f)
+// .asBufferedImage();
+// //对内存中的图片文件进行Base64处理
+// ByteArrayOutputStream newBaos = new ByteArrayOutputStream();//io流
+// ImageIO.write(bufferedImage, "jpg", newBaos);//写入流中
+// byte[] bytes = newBaos.toByteArray();//转换成字节
+// base64EncoderImg = new BASE64Encoder().encode(bytes);
+//// base64EncoderImg = URLEncoder.encode(new BASE64Encoder().encode(bytes), "UTF-8");
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+//
+//
+// //文件加密
+//// BASE64Encoder base64Encoder =new BASE64Encoder();
+//// try {
+//// base64EncoderImg = base64Encoder.encode(file.getBytes());
+//// } catch (IOException e) {
+//// e.printStackTrace();
+//// }
+//
+// 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);
+// String bucket_name ="https://excoin.oss-cn-hangzhou.aliyuncs.com";
+// String url = bucket_name + "/" + imageName;
+//
+// Map<String,Object> map = new HashMap<String,Object>();
+// Map<String,Object> map2 = new HashMap<String,Object>();
+// map.put("code",0);//0表示成功，1失败
+// map.put("msg","上传成功");//提示消息
+// map.put("data",map2);
+// map2.put("src",url);//图片url
+// map2.put("title",imageNames);//图片名称，这个会显示在输入框里
+// return map;
+// }
+
+ // 文件保存目录路径
+ @Value("${static.resource.url}")
+ private String resourceUrl;
+ // 文件保存目录URL
+ @Value("${static.resource.path}")
+ private String resourcePath;
+
/**
* 图片上传
* @return
*/
@PostMapping(value = "/uploadFileBase64")
@ControllerEndpoint(operation = "图片上传", exceptionMessage = "上传失败")
- public Map<String,Object> uploadFileBase64(@RequestBody @Validated MultipartFile file) {
- if (file.isEmpty()) {
- new FebsResponse().message("上传文件为空");
- }
-
- String base64EncoderImg = "";
- try {
- //输出到BufferedImage
- BufferedImage bufferedImage = Thumbnails.of(file.getInputStream())
- // 图片大小（长宽）压缩比例 从0-1，1表示原图
- .scale(1f)
- // 图片质量压缩比例 从0-1，越接近1质量越好
- .outputQuality(0.5f)
- .asBufferedImage();
- //对内存中的图片文件进行Base64处理
- ByteArrayOutputStream newBaos = new ByteArrayOutputStream();//io流
- ImageIO.write(bufferedImage, "jpg", newBaos);//写入流中
- byte[] bytes = newBaos.toByteArray();//转换成字节
- base64EncoderImg = new BASE64Encoder().encode(bytes);
-// base64EncoderImg = URLEncoder.encode(new BASE64Encoder().encode(bytes), "UTF-8");
- } catch (Exception e) {
- e.printStackTrace();
- }
-
-
- //文件加密
-// BASE64Encoder base64Encoder =new BASE64Encoder();
-// try {
-// base64EncoderImg = base64Encoder.encode(file.getBytes());
-// } catch (IOException e) {
-// e.printStackTrace();
+ public Map<String,Object> uploadFileBase64(@RequestBody @Validated MultipartFile file) throws IOException {
+// if (file.isEmpty()) {
+// new FebsResponse().message("上传文件为空");
// }
+// return FileUtil.fileUploadEsc(file,resourceUrl,resourcePath);
- 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);
- String bucket_name ="https://excoin.oss-cn-hangzhou.aliyuncs.com";
- String url = bucket_name + "/" + imageName;
+ if (file == null || file.isEmpty()) {
+ return new FebsResponse().message("上传文件为空").fail();
+ }
- Map<String,Object> map = new HashMap<String,Object>();
- Map<String,Object> map2 = new HashMap<String,Object>();
- map.put("code",0);//0表示成功，1失败
- map.put("msg","上传成功");//提示消息
- map.put("data",map2);
- map2.put("src",url);//图片url
- map2.put("title",imageNames);//图片名称，这个会显示在输入框里
- return map;
+ try {
+ byte[] fileBytes = file.getBytes();
+ String base64Str = java.util.Base64.getEncoder().encodeToString(fileBytes);
+ String imageSuffix = "." + file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf(".") + 1);
+ String imageNames = System.currentTimeMillis() + IdUtil.simpleUUID() + imageSuffix;
+ String imageName = "hc/" + imageNames;
+ OssUtils.uploadFileWithBase64(base64Str, imageName);
+ String bucket_name = "https://excoin.oss-cn-hangzhou.aliyuncs.com";
+ String url = bucket_name + "/" + imageName;
+
+ Map<String,Object> map = new HashMap<String,Object>();
+ Map<String,Object> map2 = new HashMap<String,Object>();
+ map2.put("src",url);//图片url
+ map2.put("title",imageNames);//图片名称，这个会显示在输入框里
+ map.put("code",0);//0表示成功，1失败
+ map.put("msg","上传成功");//提示消息
+ map.put("data",map2);
+ return map;
+ } catch (IOException e) {
+ log.error("上传失败: {}", e.getMessage());
+ return new FebsResponse().message("上传失败").fail();
+ }
}
+// /**
+// * 图片上传
+// * @return
+// */
+// @PostMapping(value = "/uploadFileBase64")
+// @ControllerEndpoint(operation = "图片上传", exceptionMessage = "上传失败")
+// public Map<String,Object> uploadFileBase64(@RequestBody @Validated MultipartFile file) throws IOException {
+// if (file.isEmpty()) {
+// new FebsResponse().message("上传文件为空");
+// }
+// return FileUtil.fileUploadEsc(file,resourceUrl,resourcePath);
+//
+//// String base64EncoderImg = "";
+//// BASE64Encoder base64Encoder =new BASE64Encoder();
+//// List<String> imageFuffixStr = CollUtil.toList(StrUtil.split(file.getOriginalFilename(), "."));
+//// String imageFuffix = file.getOriginalFilename().substring(file.getOriginalFilename().lastIndexOf("."));
+//// if("jpg".equals(imageFuffixStr.get(1))){
+//// try {
+//// //输出到BufferedImage
+//// BufferedImage bufferedImage = Thumbnails.of(file.getInputStream())
+//// // 图片大小（长宽）压缩比例 从0-1，1表示原图
+//// .scale(1f)
+//// // 图片质量压缩比例 从0-1，越接近1质量越好
+//// .outputQuality(0.9f)
+//// .asBufferedImage();
+//// //对内存中的图片文件进行Base64处理
+//// ByteArrayOutputStream newBaos = new ByteArrayOutputStream();//io流
+//// ImageIO.write(bufferedImage, "jpg", newBaos);//写入流中
+//// byte[] bytes = newBaos.toByteArray();//转换成字节
+//// base64EncoderImg = base64Encoder.encode(bytes);
+////// base64EncoderImg = URLEncoder.encode(new BASE64Encoder().encode(bytes), "UTF-8");
+//// } catch (Exception e) {
+//// e.printStackTrace();
+//// }
+//// }else{
+//// try {
+//// base64EncoderImg = base64Encoder.encode(file.getBytes());
+//// } catch (IOException e) {
+//// e.printStackTrace();
+//// }
+//// }
+//// //文件加密
+////// 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);
+//// String bucket_name ="https://excoin.oss-cn-hangzhou.aliyuncs.com";
+//// String url = bucket_name + "/" + imageName;
+////
+//// Map<String,Object> map = new HashMap<String,Object>();
+//// Map<String,Object> map2 = new HashMap<String,Object>();
+//// map.put("code",0);//0表示成功，1失败
+//// map.put("msg","上传成功");//提示消息
+//// map.put("data",map2);
+//// map2.put("src",url);//图片url
+//// map2.put("title",imageNames);//图片名称，这个会显示在输入框里
+//// return map;
+// }
public String Base64ImageByMemory(BufferedImage pic) {
String imgString = "";
@@ -292,5 +398,66 @@
return new FebsResponse().success().data(data);
}
+ /**
+ * 优惠卷列表-新增
+ */
+ @PostMapping("couponRuleAdd")
+ @ControllerEndpoint(operation = " 优惠卷列表-新增", exceptionMessage = "操作失败")
+ public FebsResponse couponRuleAdd(@RequestBody @Valid CouponRuleAddDto couponRuleAddDto) {
+ return adminMallGoodsService.couponRuleAdd(couponRuleAddDto);
+ }
+
+ /**
+ * 优惠卷列表-删除
+ */
+ @GetMapping("couponRuleDel/{id}")
+ @ControllerEndpoint(operation = "优惠卷列表-删除", exceptionMessage = "操作失败")
+ public FebsResponse couponRuleDel(@NotNull(message = "{required}") @PathVariable Long id) {
+ return adminMallGoodsService.couponRuleDel(id);
+ }
+
+ /**
+ * 优惠卷列表-上架
+ */
+ @GetMapping("upCoupon/{id}")
+ @ControllerEndpoint(operation = " 优惠卷列表-上架", exceptionMessage = "上架失败")
+ public FebsResponse upCoupon(@NotNull(message = "{required}") @PathVariable Long id) {
+ return adminMallGoodsService.upCoupon(id);
+ }
+
+ /**
+ * 优惠卷列表-下架
+ */
+ @GetMapping("downCoupon/{id}")
+ @ControllerEndpoint(operation = " 优惠卷列表-下架", exceptionMessage = "下架失败")
+ public FebsResponse downCoupon(@NotNull(message = "{required}") @PathVariable Long id) {
+ return adminMallGoodsService.downCoupon(id);
+ }
+
+ /**
+ * 优惠卷列表-更新
+ */
+ @PostMapping("couponUpdate")
+ @ControllerEndpoint(operation = "优惠卷列表-更新", exceptionMessage = "操作失败")
+ public FebsResponse couponUpdate(@RequestBody @Valid AdminMallGoodsCouponVo adminMallGoodsCouponVo) {
+ return adminMallGoodsService.couponUpdate(adminMallGoodsCouponVo);
+ }
+
+
+ @GetMapping("coupon/tree")
+ public List<AdminMallGoodsCouponTreeVo> couponTree() {
+ return adminMallGoodsService.findAdminMallGoodsCouponVoTree();
+ }
+
+ @GetMapping(value = "/couponTreeSet")
+ public FebsResponse couponTreeSet() {
+ return new FebsResponse().success().data(adminMallGoodsService.findAdminMallGoodsCouponVoTreeList());
+ }
+
+ @GetMapping(value = "/goodsTreeSet")
+ public FebsResponse goodsTreeSet() {
+ return new FebsResponse().success().data(adminMallGoodsService.findAdminMallGoodsVoTreeList());
+ }
+
}
--
Gitblit v1.9.1