diff --git a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java index f0d3c31..65aa9ac 100644 --- a/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java +++ b/src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java @@ -4367,19 +4367,24 @@ public class OrdersServiceImpl extends ServiceImpl implements } orders.setArtificer(artificer); } - orders.setPayMoneyTotal(orders.getPayMoney()); - orders.setArtificerMoneyTotal(orders.getArtificerMoney()); - if(orders.getPayMoneyTotal() == null){ - orders.setPayMoneyTotal(BigDecimal.ZERO); + + BigDecimal payMoneyTotal = BigDecimal.ZERO; + BigDecimal artificerMoneyTotal = BigDecimal.ZERO; + if(orders.getPayMoney()!=null){ + payMoneyTotal = payMoneyTotal.add(orders.getPayMoney()); } - if(orders.getArtificerMoneyTotal() == null){ - orders.setArtificerMoneyTotal(BigDecimal.ZERO); + if(orders.getArtificerMoney()!=null){ + artificerMoneyTotal = artificerMoneyTotal.add(orders.getArtificerMoney()); } //获取是否有加钟订单 if(orders.getAddNum()!=null){ - orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(orders.getAddMoney())); - orders.setArtificerMoneyTotal(orders.getArtificerMoneyTotal().add(orders.getAddArtificerMoney())); + if(orders.getAddMoney()!=null){ + payMoneyTotal = payMoneyTotal.add(orders.getAddMoney()); + } + if(orders.getAddArtificerMoney()!=null){ + artificerMoneyTotal = artificerMoneyTotal.add(orders.getAddArtificerMoney()); + } } //获取是否有改价订单 @@ -4397,9 +4402,15 @@ public class OrdersServiceImpl extends ServiceImpl implements // } // } Orders oldOrders = getTotalMoney(orders); - orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(oldOrders.getPayMoney())); - orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(oldOrders.getArtificerMoney())); + if(oldOrders.getPayMoney()!=null){ + payMoneyTotal = payMoneyTotal.add(oldOrders.getPayMoney()); + } + if(oldOrders.getArtificerMoney()!=null){ + artificerMoneyTotal = artificerMoneyTotal.add(oldOrders.getArtificerMoney()); + } } + orders.setPayMoneyTotal(payMoneyTotal); + orders.setPayMoneyTotal(artificerMoneyTotal); return Result.success().put("data", orders); }