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

项目详情统计金额调整

This commit is contained in:
曹磊 2024-07-09 20:46:10 +08:00
parent 7f01cb37d9
commit 312272d081
1 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4375,27 +4375,64 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
if(orders.getArtificerMoneyTotal() == null){ if(orders.getArtificerMoneyTotal() == null){
orders.setArtificerMoneyTotal(BigDecimal.ZERO); orders.setArtificerMoneyTotal(BigDecimal.ZERO);
} }
//获取是否有加钟订单 //获取是否有加钟订单
if(orders.getAddNum()!=null){ if(orders.getAddNum()!=null){
orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(orders.getAddMoney())); orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(orders.getAddMoney()));
orders.setArtificerMoneyTotal(orders.getArtificerMoneyTotal().add(orders.getAddArtificerMoney())); orders.setArtificerMoneyTotal(orders.getArtificerMoneyTotal().add(orders.getAddArtificerMoney()));
} }
//获取是否有改价订单 //获取是否有改价订单
if(orders.getOldOrdersId()!=null){ if(orders.getOldOrdersId()!=null){
QueryWrapper<Orders> ordersQueryWrapper = new QueryWrapper<Orders>(); // QueryWrapper<Orders> ordersQueryWrapper = new QueryWrapper<Orders>();
ordersQueryWrapper.eq("orders_id",orders.getOldOrdersId()); // ordersQueryWrapper.eq("orders_id",orders.getOldOrdersId());
ordersQueryWrapper.ne("status",4); // ordersQueryWrapper.ne("status",4);
List<Orders> list = baseMapper.selectList(ordersQueryWrapper); // List<Orders> list = baseMapper.selectList(ordersQueryWrapper);
if(list!=null && list.size()>0) { // if(list!=null && list.size()>0) {
for(Orders vo : list){ // for(Orders vo : list){
BigDecimal payMoney = vo.getPayMoney(); // BigDecimal payMoney = vo.getPayMoney();
BigDecimal artificerMoney = vo.getArtificerMoney(); // BigDecimal artificerMoney = vo.getArtificerMoney();
orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(payMoney)); // orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(payMoney));
orders.setArtificerMoneyTotal(orders.getArtificerMoneyTotal().add(artificerMoney)); // orders.setArtificerMoneyTotal(orders.getArtificerMoneyTotal().add(artificerMoney));
// }
// }
Orders oldOrders = getTotalMoney(orders);
orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(oldOrders.getPayMoney()));
orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(oldOrders.getArtificerMoney()));
}
return Result.success().put("data", orders);
}
private Orders getTotalMoney(Orders orders){
Orders orders1 = new Orders();
QueryWrapper<Orders> ordersQueryWrapper = new QueryWrapper<Orders>();
ordersQueryWrapper.eq("orders_id",orders.getOldOrdersId());
ordersQueryWrapper.ne("status",4);
List<Orders> list = baseMapper.selectList(ordersQueryWrapper);
BigDecimal payMoneyTotal = BigDecimal.ZERO;
BigDecimal artificerMoneyTotal = BigDecimal.ZERO;
if(list!=null && list.size()>0) {
for(Orders vo : list){
if(vo.getOldOrdersId()!=null){
Orders oldOrders = getTotalMoney(vo);
if(oldOrders.getPayMoney()!=null){
payMoneyTotal = payMoneyTotal.add(oldOrders.getPayMoney());
}
if(oldOrders.getArtificerMoney()!=null){
artificerMoneyTotal = artificerMoneyTotal.add(oldOrders.getArtificerMoney());
}
}
if(vo.getPayMoney()!=null){
payMoneyTotal = payMoneyTotal.add(vo.getPayMoney());
}
if(vo.getArtificerMoney()!=null){
artificerMoneyTotal = artificerMoneyTotal.add(vo.getArtificerMoney());
} }
} }
} }
return Result.success().put("data", orders); orders1.setPayMoney(payMoneyTotal);
orders1.setArtificerMoney(artificerMoneyTotal);
return orders1;
} }
@Override @Override
@ -5998,7 +6035,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
orders.setJsFwcn(jsFwcn); orders.setJsFwcn(jsFwcn);
orders.setJsPjtag(jsPjtag); orders.setJsPjtag(jsPjtag);
orders.setJsTsbz(jsTsbz); orders.setJsTsbz(jsTsbz);
orders.setStatus(5); orders.setStatus(15);
//修改订单表类型 //修改订单表类型
baseMapper.updateById(orders); baseMapper.updateById(orders);