From 33a6a3deb07a08d200bec32eeee9b12504c5008b Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 30 十二月 2024 10:01:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java | 2 --
manage/src/main/java/com/jilongda/manage/utils/OssUploadUtil.java | 38 ++++++++++++++++++++++++++++++++++++++
manage/src/main/java/com/jilongda/manage/query/TOrderAftersalesQuery.java | 4 ++++
manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java | 5 +++++
4 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java b/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
index c322807..fe3df53 100644
--- a/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
+++ b/manage/src/main/java/com/jilongda/manage/controller/TOrderAftersalesController.java
@@ -18,6 +18,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import java.text.SimpleDateFormat;
@@ -56,6 +57,10 @@
@ApiOperation(value = "订单售后列表")
@PostMapping(value = "/pageList")
public ApiResult<PageInfo<TOrderAftersalesVO>> pageList(@RequestBody TOrderAftersalesQuery query) {
+ if (StringUtils.hasLength(query.getStartTime())){
+ query.setStartTime(query.getStartTime()+" 00:00:00");
+ query.setEndTime(query.getEndTime()+" 23:59:59");
+ }
PageInfo<TOrderAftersalesVO> orderAftersalesVOPageInfo = orderAftersalesService.pageList(query);
return ApiResult.success(orderAftersalesVOPageInfo);
}
diff --git a/manage/src/main/java/com/jilongda/manage/query/TOrderAftersalesQuery.java b/manage/src/main/java/com/jilongda/manage/query/TOrderAftersalesQuery.java
index 89e6a26..ccecfea 100644
--- a/manage/src/main/java/com/jilongda/manage/query/TOrderAftersalesQuery.java
+++ b/manage/src/main/java/com/jilongda/manage/query/TOrderAftersalesQuery.java
@@ -17,5 +17,9 @@
@ApiModelProperty(value = "门店id")
private Integer storeId;
+ @ApiModelProperty(value = "起始时间 2022-11-11")
+ private String startTime;
+ @ApiModelProperty(value = "结束时间 2023-11-11")
+ private String endTime;
}
diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
index 7983ab7..3e10b96 100644
--- a/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
@@ -86,8 +86,6 @@
return pageInfo;
}
-
-
@Override
public PageInfo<TWarehousingVO> inventoryReceiptList(TWarehousingDetailQuery query) {
PageInfo<TWarehousingVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
diff --git a/manage/src/main/java/com/jilongda/manage/utils/OssUploadUtil.java b/manage/src/main/java/com/jilongda/manage/utils/OssUploadUtil.java
new file mode 100644
index 0000000..6be2764
--- /dev/null
+++ b/manage/src/main/java/com/jilongda/manage/utils/OssUploadUtil.java
@@ -0,0 +1,38 @@
+package com.jilongda.manage.utils;
+
+import com.aliyun.oss.OSSClient;
+import com.aliyun.oss.model.ObjectMetadata;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.UUID;
+
+public class OssUploadUtil {
+ //OSS图片访问域名
+ public static String oss_domain = "https://we-park-life.oss-cn-beijing.aliyuncs.com/";
+ public static String accessKeyId = "LTAI47eyqWWhBPXM";
+ public static String accessKeySecret = "orsYX78NvgXS9KbN7wCwRja1wkUwPc";
+ public static String bucketName="we-park-life";
+ public static String endpoint = "oss-cn-beijing.aliyuncs.com";
+
+ public static OSSClient ossClient = new OSSClient(endpoint, accessKeyId,accessKeySecret);
+
+ public static String ossUpload(String filePath, MultipartFile file) throws IOException{
+ //CommonsMultipartFile file = (CommonsMultipartFile)multipartFile;
+ String fileName = "";
+ if(file!=null && !"".equals(file.getOriginalFilename()) && file.getOriginalFilename()!=null){
+ InputStream content = file.getInputStream();//获得指定文件的输入流
+ ObjectMetadata meta = new ObjectMetadata();// 创建上传Object的Metadata
+ meta.setContentLength(file.getSize()); // 必须设置ContentLength
+ String originalFilename = file.getOriginalFilename();
+ fileName = UUID.randomUUID().toString().replaceAll("-","") + originalFilename.subSequence(originalFilename.lastIndexOf("."), originalFilename.length());
+ ossClient.putObject(bucketName, filePath + fileName, content, meta);// 上传Object.
+ if(fileName != null && !"".equals(fileName)){
+ System.out.println(fileName);
+ fileName = oss_domain+ filePath +fileName;
+ }
+ }
+ return fileName;
+ }
+}
--
Gitblit v1.7.1