项目详情统计金额调整
This commit is contained in:
parent
7f01cb37d9
commit
312272d081
|
@ -4375,27 +4375,64 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
|||
if(orders.getArtificerMoneyTotal() == null){
|
||||
orders.setArtificerMoneyTotal(BigDecimal.ZERO);
|
||||
}
|
||||
|
||||
//获取是否有加钟订单
|
||||
if(orders.getAddNum()!=null){
|
||||
orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(orders.getAddMoney()));
|
||||
orders.setArtificerMoneyTotal(orders.getArtificerMoneyTotal().add(orders.getAddArtificerMoney()));
|
||||
}
|
||||
|
||||
//获取是否有改价订单
|
||||
if(orders.getOldOrdersId()!=null){
|
||||
QueryWrapper<Orders> ordersQueryWrapper = new QueryWrapper<Orders>();
|
||||
ordersQueryWrapper.eq("orders_id",orders.getOldOrdersId());
|
||||
ordersQueryWrapper.ne("status",4);
|
||||
List<Orders> list = baseMapper.selectList(ordersQueryWrapper);
|
||||
if(list!=null && list.size()>0) {
|
||||
for(Orders vo : list){
|
||||
BigDecimal payMoney = vo.getPayMoney();
|
||||
BigDecimal artificerMoney = vo.getArtificerMoney();
|
||||
orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(payMoney));
|
||||
orders.setArtificerMoneyTotal(orders.getArtificerMoneyTotal().add(artificerMoney));
|
||||
// QueryWrapper<Orders> ordersQueryWrapper = new QueryWrapper<Orders>();
|
||||
// ordersQueryWrapper.eq("orders_id",orders.getOldOrdersId());
|
||||
// ordersQueryWrapper.ne("status",4);
|
||||
// List<Orders> list = baseMapper.selectList(ordersQueryWrapper);
|
||||
// if(list!=null && list.size()>0) {
|
||||
// for(Orders vo : list){
|
||||
// BigDecimal payMoney = vo.getPayMoney();
|
||||
// BigDecimal artificerMoney = vo.getArtificerMoney();
|
||||
// orders.setPayMoneyTotal(orders.getPayMoneyTotal().add(payMoney));
|
||||
// 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
|
||||
|
@ -5998,7 +6035,7 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
|
|||
orders.setJsFwcn(jsFwcn);
|
||||
orders.setJsPjtag(jsPjtag);
|
||||
orders.setJsTsbz(jsTsbz);
|
||||
orders.setStatus(5);
|
||||
orders.setStatus(15);
|
||||
//修改订单表类型
|
||||
baseMapper.updateById(orders);
|
||||
|
||||
|
|
Loading…
Reference in New Issue