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 65aeaa2..8a583ba 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 @@ -4907,6 +4907,10 @@ public class OrdersServiceImpl extends ServiceImpl implements List list = baseMapper.selectList(ordersQueryWrapper); BigDecimal payMoneyTotal = BigDecimal.ZERO; BigDecimal artificerMoneyTotal = BigDecimal.ZERO; + BigDecimal shopMoneyTotal = BigDecimal.ZERO; + BigDecimal jjrArtificerDeductMoneyTotal = BigDecimal.ZERO; + BigDecimal fxyOneArtificerDeductMoneyTotal = BigDecimal.ZERO; + BigDecimal fxyTwoArtificerDeductMoneyTotal = BigDecimal.ZERO; if(list!=null && list.size()>0) { for(Orders vo : list){ if(vo.getOldOrdersId()!=null){ @@ -4917,6 +4921,18 @@ public class OrdersServiceImpl extends ServiceImpl implements if(oldOrders.getArtificerMoney()!=null){ artificerMoneyTotal = artificerMoneyTotal.add(oldOrders.getArtificerMoney()); } + if(oldOrders.getShopMoney()!=null){ + shopMoneyTotal = shopMoneyTotal.add(oldOrders.getShopMoney()); + } + if(oldOrders.getJjrArtificerDeductMoney()!=null){ + jjrArtificerDeductMoneyTotal = jjrArtificerDeductMoneyTotal.add(oldOrders.getJjrArtificerDeductMoney()); + } + if(oldOrders.getFxyOneArtificerDeductMoney()!=null){ + fxyOneArtificerDeductMoneyTotal = fxyOneArtificerDeductMoneyTotal.add(oldOrders.getFxyOneArtificerDeductMoney()); + } + if(oldOrders.getFxyTwoArtificerDeductMoney()!=null){ + fxyTwoArtificerDeductMoneyTotal = fxyTwoArtificerDeductMoneyTotal.add(oldOrders.getFxyTwoArtificerDeductMoney()); + } } if(vo.getPayMoney()!=null){ payMoneyTotal = payMoneyTotal.add(vo.getPayMoney()); @@ -4924,10 +4940,26 @@ public class OrdersServiceImpl extends ServiceImpl implements if(vo.getArtificerMoney()!=null){ artificerMoneyTotal = artificerMoneyTotal.add(vo.getArtificerMoney()); } + if(vo.getShopMoney()!=null){ + shopMoneyTotal = shopMoneyTotal.add(vo.getShopMoney()); + } + if(vo.getJjrArtificerDeductMoney()!=null){ + jjrArtificerDeductMoneyTotal = jjrArtificerDeductMoneyTotal.add(vo.getJjrArtificerDeductMoney()); + } + if(vo.getFxyOneArtificerDeductMoney()!=null){ + fxyOneArtificerDeductMoneyTotal = fxyOneArtificerDeductMoneyTotal.add(vo.getFxyOneArtificerDeductMoney()); + } + if(vo.getFxyTwoArtificerDeductMoney()!=null){ + fxyTwoArtificerDeductMoneyTotal = fxyTwoArtificerDeductMoneyTotal.add(vo.getFxyTwoArtificerDeductMoney()); + } } } orders1.setPayMoney(payMoneyTotal); orders1.setArtificerMoney(artificerMoneyTotal); + orders1.setShopMoney(shopMoneyTotal); + orders1.setJjrArtificerDeductMoney(jjrArtificerDeductMoneyTotal); + orders1.setFxyOneArtificerDeductMoney(fxyOneArtificerDeductMoneyTotal); + orders1.setFxyTwoArtificerDeductMoney(fxyTwoArtificerDeductMoneyTotal); return orders1; }