From 559fad20bc5932190fd03040bc786e4188abff20 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Wed, 24 Sep 2025 19:07:45 +0800
Subject: [PATCH] 1

---
 .../modules/apiService/impl/OrderServiceImpl.java   | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java
index 5266c6c..dd0feb2 100644
--- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java
+++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiService/impl/OrderServiceImpl.java
@@ -310,7 +310,8 @@ public class OrderServiceImpl implements OrderService {
 
         if(payType == 1){
             //余额支付
-            if(hanHaiMember.getPrice().compareTo(payPrice)==-1){
+            BigDecimal hanHaiMemberPrice = hanHaiMember.getPrice() == null ? BigDecimal.ZERO : hanHaiMember.getPrice();
+            if(hanHaiMemberPrice.compareTo(payPrice)==-1){
                 return Result.error("余额不足");
             }
             subtractMemberAmount(hanHaiMember, payPrice, "支付保险费：" + order.getTitle());
@@ -475,12 +476,12 @@ public class OrderServiceImpl implements OrderService {
         if(order==null){
             return Result.error("订单不存在");
         }
-        if(order.getStatus()>1){
-            return Result.error("订单进行,不能取消");
-        }
         if(order.getStatus()==6){
             return Result.error("订单已经取消,不能取消");
         }
+        if(order.getStatus()>1){
+            return Result.error("订单进行,不能取消");
+        }
 
 
         EmploySeek seek = employSeekService.getById(order.getSeekId());
@@ -523,12 +524,12 @@ public class OrderServiceImpl implements OrderService {
         if(order==null){
             return Result.error("订单不存在");
         }
-        if(order.getStatus()>1){
-            return Result.error("订单进行,不能确认");
-        }
         if(order.getStatus()==6){
             return Result.error("订单已经取消,不能确认");
         }
+        if(order.getStatus()>1){
+            return Result.error("订单进行,不能确认");
+        }
 
         EmploySeek seek = employSeekService.getById(order.getSeekId());
         if (seek != null){
@@ -628,7 +629,8 @@ public class OrderServiceImpl implements OrderService {
 
         if(payType == 1){
             //余额支付
-            if(hanHaiMember.getPrice().compareTo(payPrice)==-1){
+            BigDecimal hanHaiMemberPrice = hanHaiMember.getPrice() == null ? BigDecimal.ZERO : hanHaiMember.getPrice();
+            if(hanHaiMemberPrice.compareTo(payPrice)==-1){
                 return Result.error("余额不足");
             }
 
@@ -769,7 +771,8 @@ public class OrderServiceImpl implements OrderService {
     }
 
     public void subtractMemberAmount(HanHaiMember hanHaiMember, BigDecimal payPrice, String title){
-        hanHaiMember.setPrice(hanHaiMember.getPrice().subtract(payPrice));
+        BigDecimal price = hanHaiMember.getPrice() == null ? BigDecimal.ZERO : hanHaiMember.getPrice();
+        hanHaiMember.setPrice(price.subtract(payPrice));
         hanHaiMemberService.updateById(hanHaiMember);
         //增加金额明细
         EmployAmountLog amountLog = new EmployAmountLog();