From 061f67ee25e3991ab55ae5b9cac7bde86bb422dd Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 08 一月 2025 09:37:02 +0800
Subject: [PATCH] 订单导入
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
index a185b9d..a065799 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java
@@ -769,9 +769,7 @@
public R<String> importTemplate(HttpServletResponse response) throws Exception {
List<FrozenBuckleImportDTO> list = new ArrayList<>();
FrozenBuckleImportDTO bean = new FrozenBuckleImportDTO();
-
list.add(bean);
-
// 这里URLEncoder.encode可以防止中文乱码
String fileName = URLEncoder.encode("订单导入模板", "UTF-8");
response.setContentType("application/vnd.ms-excel");
@@ -856,6 +854,8 @@
Site site = sites.stream().filter(e -> e.getSiteName().equals(frozenBuckleImportDTO.getSiteName())).findFirst().orElse(null);
if(Objects.nonNull(site)){
order.setSiteId(site.getId());
+ }else {
+ return R.fail("站点信息不存在");
}
// 师傅信息
if (StringUtils.hasLength(order.getServerName())) {
@@ -863,6 +863,8 @@
if(Objects.nonNull(masterWorker)){
order.setServerId(masterWorker.getId());
order.setServerPhone(masterWorker.getPhone());
+ }else {
+ return R.fail("师傅信息不存在");
}
order.setAcceptTime(new Date());
// 待上门
@@ -880,6 +882,8 @@
if(Objects.nonNull(recoveryServe)){
order.setServeId(recoveryServe.getId());
order.setServePrice(recoveryServe.getDefaultPrice());
+ }else {
+ return R.fail("回收服务不存在");
}
RecoveryServePrice one = recoveryServePriceService.lambdaQuery().eq(RecoveryServePrice::getCity, order.getCityCode()).eq(RecoveryServePrice::getRecoveryServeId, order.getServeId()).eq(BaseEntity::getIsDelete, 0).one();
if (one==null) {
--
Gitblit v1.7.1