From 7fd053651ac11db87fe4f6c57e65eed3b9a59452 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 23 七月 2025 10:47:24 +0800
Subject: [PATCH] yml活动管理代码
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java
index dc3b6ed..5027c93 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/ChargeOrderServiceImpl.java
@@ -1,7 +1,7 @@
package com.ruoyi.order.service.impl;
import cn.hutool.core.util.IdUtil;
-import com.alibaba.fastjson2.JSONObject;
+import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.account.api.feignClient.AppUserClient;
@@ -68,7 +68,7 @@
@Override
- public void importExpress(MultipartFile file) {
+ public R<JSONObject> importExpress(MultipartFile file) {
/* System.out.println("导入订单url:"+url);
URL url1 = null;
try {
@@ -80,7 +80,7 @@
throw new RuntimeException(e);
}*/
List<String> orderNumberList=new ArrayList<>();
-
+ JSONObject result = new JSONObject();
try (InputStream inputStream = file.getInputStream();
Workbook workbook = new XSSFWorkbook(inputStream)) {
// Workbook workbook = new XSSFWorkbook(fileInputStream);
@@ -238,14 +238,18 @@
//检查订单号是否重复
if (orderNumberList.contains(orderNum)) {
- throw new ServiceException("订单号重复：" + orderNum, 500);
+// throw new ServiceException("订单号重复：" + orderNum, 500);
+ result.append("订单号：[", orderNum+"]重复");
+ continue;
}
//数据库中是否存在
ChargeOrder order = chargeOrderService.getOne(new LambdaQueryWrapper<ChargeOrder>()
.eq(ChargeOrder::getOrderNumber, orderNum)
);
if (order != null) {
- throw new ServiceException("数据库中订单已存在：" + orderNum, 500);
+// throw new ServiceException("数据库中订单已存在：" + orderNum, 500);
+ result.append("订单号：[", orderNum+"]数据库中订单已存在");
+ continue;
}
orderNumberList.add(orderNum);//添加到订单集合中
@@ -279,6 +283,10 @@
e.printStackTrace();
throw new ServiceException(e.getMessage());
}
+ if(!result.isEmpty()){
+ return R.ok(result);
+ }
+ return R.ok();
}
@Override
--
Gitblit v1.7.1