From 7c8da7766dfe845c19847a9d5e8ec9b93d2a9392 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 16 十二月 2024 09:48:34 +0800
Subject: [PATCH] 1.阿里云服务器欠费异常处理 2.行政区划部分数据有问题-临时性修改
---
src/main/resources/LocList.xml | 4 ++--
src/main/java/com/mzl/flower/service/UploadService.java | 5 ++++-
src/main/resources/mapper/payment/OrderMapper.xml | 21 ---------------------
3 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/mzl/flower/service/UploadService.java b/src/main/java/com/mzl/flower/service/UploadService.java
index 2cd8739..16a412a 100644
--- a/src/main/java/com/mzl/flower/service/UploadService.java
+++ b/src/main/java/com/mzl/flower/service/UploadService.java
@@ -3,6 +3,7 @@
import com.aliyun.oss.OSS;
import com.aliyun.oss.OSSClientBuilder;
import com.mzl.flower.config.OssProperties;
+import com.mzl.flower.config.exception.ValidationException;
import com.mzl.flower.utils.UUIDGenerator;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -42,10 +43,12 @@
// 把上传之后文件路径返回，需手动拼接上传到阿里云的oss路径
// https://edu-mys.oss-cn-chengdu.aliyuncs.com/yy.JPG
String url = bucketName + "." + endPoint + "/" + filename;
+
return url;
} catch (Exception e) {
e.printStackTrace();
- return null;
+ throw new ValidationException("上传到云服务器发生异常");
+// return null;
}
}
}
diff --git a/src/main/resources/LocList.xml b/src/main/resources/LocList.xml
index 82f1b82..6cfcadc 100644
--- a/src/main/resources/LocList.xml
+++ b/src/main/resources/LocList.xml
@@ -26,7 +26,7 @@
<Region Name="河东" Code="2" />
<Region Name="河西" Code="3" />
<Region Name="南开" Code="4" />
- <Region Name="河北" Code="5" />
+ <Region Name="河北区" Code="5" />
<Region Name="红桥" Code="6" />
<Region Name="滨海新区" Code="26" />
<Region Name="东丽" Code="10" />
@@ -618,7 +618,7 @@
<Region Name="调兵山市" Code="81" />
<Region Name="开原市" Code="82" />
</City>
- <City Name="朝阳" Code="13">
+ <City Name="朝阳市" Code="13">
<Region Name="双塔区" Code="2" />
<Region Name="龙城区" Code="3" />
<Region Name="朝阳县" Code="21" />
diff --git a/src/main/resources/mapper/payment/OrderMapper.xml b/src/main/resources/mapper/payment/OrderMapper.xml
index fc86d17..4e4a2ab 100644
--- a/src/main/resources/mapper/payment/OrderMapper.xml
+++ b/src/main/resources/mapper/payment/OrderMapper.xml
@@ -203,13 +203,6 @@
and o.transfer_id is null
and o.status in ('COLLECTION','SEND')
)
--- AND exists(
--- select 1 from t_order_item oi
--- where oi.order_id = q.id
--- and oi.status in ('abnormal','reduce','lack','back')
--- )
--- and q.transfer_id is null
--- and q.status in ('COLLECTION', 'SEND')
</if>
<if test="condition.abnormalOrderStatus != null and condition.abnormalOrderStatus != '' and condition.abnormalOrderStatus == 'PROCESSED'">
@@ -225,20 +218,6 @@
and o.transfer_id is null
and o.status in ('COLLECTION','SEND')
)
--- AND exists(
--- select 1 from t_order_item oi
--- where oi.order_id = q.id
--- and oi.status in ('abnormal','reduce','lack','back')
--- )
--- AND not exists(
--- select 1 from t_order_item oi
--- where oi.order_id = q.id
--- and oi.status in ('abnormal','reduce','lack','back')
--- and q.transfer_id is null
--- and q.status in ('COLLECTION', 'SEND')
--- )
-
-
</if>
ORDER BY q.create_time desc, q.payment_time desc
--
Gitblit v1.9.3