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();