yangjun
/
sadjv3_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目详情汇总金额

This commit is contained in:
曹磊 2024-07-09 21:04:34 +08:00
parent b62fc99d2b
commit 5355f98591
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/java/com/sqx/modules/artificer/service/impl/OrdersServiceImpl.java
View File

@ -4367,19 +4367,24 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
} }
orders.setArtificer(artificer); orders.setArtificer(artificer);
} }
orders.setPayMoneyTotal(orders.getPayMoney());
orders.setArtificerMoneyTotal(orders.getArtificerMoney()); BigDecimal payMoneyTotal = BigDecimal.ZERO;
if(orders.getPayMoneyTotal() == null){ BigDecimal artificerMoneyTotal = BigDecimal.ZERO;
orders.setPayMoneyTotal(BigDecimal.ZERO); if(orders.getPayMoney()!=null){
payMoneyTotal = payMoneyTotal.add(orders.getPayMoney());
} }
if(orders.getArtificerMoneyTotal() == null){ if(orders.getArtificerMoney()!=null){
orders.setArtificerMoneyTotal(BigDecimal.ZERO); artificerMoneyTotal = artificerMoneyTotal.add(orders.getArtificerMoney());
} }
//获取是否有加钟订单 //获取是否有加钟订单
if(orders.getAddNum()!=null){ if(orders.getAddNum()!=null){
orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(orders.getAddMoney())); if(orders.getAddMoney()!=null){
orders.setArtificerMoneyTotal(orders.getArtificerMoneyTotal().add(orders.getAddArtificerMoney())); payMoneyTotal = payMoneyTotal.add(orders.getAddMoney());
}
if(orders.getAddArtificerMoney()!=null){
artificerMoneyTotal = artificerMoneyTotal.add(orders.getAddArtificerMoney());
}
} }
//获取是否有改价订单 //获取是否有改价订单
@ -4397,9 +4402,15 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
// } // }
// } // }
Orders oldOrders = getTotalMoney(orders); Orders oldOrders = getTotalMoney(orders);
orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(oldOrders.getPayMoney())); if(oldOrders.getPayMoney()!=null){
orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(oldOrders.getArtificerMoney())); 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); return Result.success().put("data", orders);
} }