From b0b202c2bdc2a97d5c49a3506264c47c6ac4c343 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 8 Aug 2024 21:46:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E5=B8=88=E5=88=86=E4=BD=A3=E6=89=BF?=
 =?UTF-8?q?=E6=8B=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OrdersServiceImpl.java       | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

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<OrdersDao, Orders> implements
         List<Orders> 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<OrdersDao, Orders> 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<OrdersDao, Orders> 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;
     }