From e15c348bc992de7331d14d76451032358aae9289 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Thu, 09 Jan 2025 15:44:14 +0800
Subject: [PATCH] feat(mall): 商品列表增加活动筛选功能
---
src/main/java/cc/mrbird/febs/mall/controller/CommonController.java | 96 +++++++++++++++++++++++++-----------------------
1 files changed, 50 insertions(+), 46 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java b/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
index e268eba..dbe5a30 100644
--- a/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
+++ b/src/main/java/cc/mrbird/febs/mall/controller/CommonController.java
@@ -5,33 +5,23 @@
import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.*;
import cc.mrbird.febs.mall.dto.AccountAndCodeDto;
+import cc.mrbird.febs.mall.dto.ApiCheckTraceInfoDto;
import cc.mrbird.febs.mall.dto.Base64UploadDto;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.service.ICommonService;
-import cn.hutool.core.io.file.FileNameUtil;
-import cn.hutool.core.lang.UUID;
+import cc.mrbird.febs.mall.vo.OrderListVo;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
-import com.thoughtworks.xstream.core.BaseException;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
+import com.best.javaSdk.kdTraceQuery.response.KdTraceQueryRsp;
+import io.swagger.annotations.*;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import net.coobird.thumbnailator.Thumbnails;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.FileCopyUtils;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import sun.misc.BASE64Encoder;
-import javax.imageio.ImageIO;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -51,7 +41,7 @@
private final RedisUtils redisUtils;
private final ICommonService commonService;
- @ApiOperation(value = "获取验证码接口", notes = "获取验证码通用接口")
+ @ApiOperation(value = "（马来西亚）INFOBIP获取验证码接口", notes = "（马来西亚）INFOBIP获取验证码接口")
@GetMapping(value = "/verifyCode")
public FebsResponse verifyCode(@ApiParam(name = "account", value = "手机号", required = true) @RequestParam(value = "account") String account,
@ApiParam(name = "type", value = "类型1-手机号", required = true) @RequestParam("type") String type) {
@@ -64,9 +54,7 @@
// 发送手机验证码
if (AppContants.ACCOUNT_TYPE_MOBILE.equals(type)) {
-// boolean result = Sms106Send.sendVerifyCode(account, code.toString(), 2);
- boolean result = ZzSmsSend.sendALiYun(account, code.toString());
-// boolean result = ZzSmsSend.sendVerifyCode(account, code.toString(), 2);
+ boolean result = InfobipSmsSend.sendSms(account, code.toString());
if (result) {
Map<String, Object> map = new HashMap<>();
boolean flag = redisUtils.set(AppContants.VERIFY_CODE_PREFIX + account, code, 120);
@@ -135,9 +123,9 @@
@Value("${static.resource.path}")
private String resourcePath;
- @ApiOperation(value = "文件上传服务器", notes = "文件上传服务器")
- @GetMapping(value = "/fileUploadEsc")
- public Map<String,Object> fileUploadEsc(MultipartFile file) throws IOException {
+ @ControllerEndpoint(operation = "文件上传服务器", exceptionMessage = "上传失败")
+ @PostMapping(value = "/fileUploadEsc")
+ public Map<String,Object> fileUploadEsc(@RequestBody @Validated MultipartFile file) throws IOException {
if (file == null) {
throw new FebsException("上传文件不能为空");
}
@@ -150,35 +138,36 @@
*/
@PostMapping(value = "/uploadFileBase64")
@ControllerEndpoint(operation = "图片上传", exceptionMessage = "上传失败")
- public Map<String,Object> uploadFileBase64(@RequestBody @Validated MultipartFile file) {
+ public Map<String,Object> uploadFileBase64(@RequestBody @Validated MultipartFile file) throws IOException {
if (file == null || file.isEmpty()) {
return new FebsResponse().message("上传文件为空");
}
+ return FileUtil.fileUploadEsc(file,resourceUrl,resourcePath);
- //文件加密
- BASE64Encoder base64Encoder =new BASE64Encoder();
- String base64EncoderImg = null;
- try {
- base64EncoderImg = base64Encoder.encode(file.getBytes());
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- 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;
+// //文件加密
+// BASE64Encoder base64Encoder =new BASE64Encoder();
+// String base64EncoderImg = null;
+// try {
+// base64EncoderImg = base64Encoder.encode(file.getBytes());
+// } catch (IOException e) {
+// e.printStackTrace();
+// }
+//
+// 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;
}
@ApiOperation(value = "数据字典")
@@ -222,4 +211,19 @@
}
return new FebsResponse().fail().message("验证码错误");
}
+
+ @ApiOperation(value = "获取快递信息接口")
+ @ApiResponses({
+ @ApiResponse(code = 200, message = "success", response = KdTraceQueryRsp.class)
+ })
+ @PostMapping(value = "/checkTraceInfo")
+ public FebsResponse checkTraceInfo(@RequestBody ApiCheckTraceInfoDto checkTraceInfoDto) {
+
+ KdTraceQueryRsp traceQueryRsp = commonService.checkTraceInfo(checkTraceInfoDto);
+ boolean result = traceQueryRsp.isResult();
+ if (result) {
+ return new FebsResponse().success().data(traceQueryRsp);
+ }
+ return new FebsResponse().fail().message("请检查您的快递单号是否输入正确。");
+ }
}
--
Gitblit v1.9.1