From 704784eeca74c4d96ed335ed121809520f9a76f4 Mon Sep 17 00:00:00 2001
From: luo <2855143437@qq.com>
Date: 星期一, 19 二月 2024 11:17:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 2ccdf51..45b3e09 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -274,7 +274,8 @@
if (!orderLogisticsId.isEmpty()){
double sum = 0;
for (OrderLogisticsSpread orderLogisticsSpread : orderLogisticsId) {
- if (orderLogisticsSpread.getPayType() == 4) {
+
+ if (orderLogisticsSpread.getPayType()!=null&&orderLogisticsSpread.getPayType() == 4) {
Double payMoney = orderLogisticsSpread.getPayMoney();
sum = sum + payMoney;
}
--
Gitblit v1.7.1