From f673fd85f198a8d99f531ae6ca16246bcc3bdea9 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期日, 26 一月 2025 14:53:02 +0800
Subject: [PATCH] 12.18
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index 0d05823..80e6951 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -30,6 +30,10 @@
import com.ruoyi.system.api.feignClient.SysUserClient;
import com.ruoyi.system.api.model.LoginUser;
import io.swagger.annotations.*;
+import org.springframework.core.io.InputStreamResource;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -38,8 +42,10 @@
import javax.servlet.http.HttpServletResponse;
import javax.validation.constraints.NotBlank;
import java.io.IOException;
+import java.io.InputStream;
import java.io.PrintWriter;
import java.math.BigDecimal;
+import java.net.URL;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
@@ -519,9 +525,11 @@
/**
* 导入物流信息
*/
- @PostMapping("/importExpress")
- public R importExpress(@RequestParam("file") MultipartFile file){
- orderService.importExpress(file);
+ @GetMapping("/importExpress")
+ public R importExpress(@RequestBody String url){
+ JSONObject jsonObject = JSONObject.parseObject(url);
+ String url2 = jsonObject.getString("url");
+ orderService.importExpress(url2);
return R.ok();
}
@@ -535,5 +543,6 @@
ExcelUtil<OrderPageListVo> util = new ExcelUtil<OrderPageListVo>(OrderPageListVo.class);
util.exportExcel(response, list, "订单数据");
}
+
}
--
Gitblit v1.7.1