From f4b6b7604a789dc80b695584e60e3aa4f0ab858a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 11 Jul 2024 15:00:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=8A=A0=E9=92=9F=E6=97=B6?=
 =?UTF-8?q?=E5=B0=86=E5=BE=85=E8=A1=A5=E5=8D=95=E6=8A=80=E5=B8=88=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E6=94=B6=E7=9B=8A=E6=94=BE=E5=88=B0old=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/OrdersServiceImpl.java        | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

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 f6c538a..0960f9a 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
@@ -1465,9 +1465,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
                 orders.setOldMassageDuration(oldOrders.getDuration());
                 orders.setOldArtificerMoney(oldOrders.getArtificerMoney());
                 orders.setArtificerTaxiMoney(oldOrders.getArtificerTaxiMoney());
-                if(oldOrders.getIsSupplement().equals(1)){
-                    BigDecimal projectBenefits = oldOrders.getProjectBenefits().add(oldOrders.getOldProjectBenefits());
-                    orders.setOldProjectBenefits(projectBenefits);
+                if(oldOrders.getIsSupplement()!=null){
+                    if(oldOrders.getIsSupplement().equals(1)){
+                        BigDecimal projectBenefits = oldOrders.getProjectBenefits().add(oldOrders.getOldProjectBenefits());
+                        orders.setOldProjectBenefits(projectBenefits);
+                    }else{
+                        orders.setOldProjectBenefits(oldOrders.getProjectBenefits());
+                    }
                 }else{
                     orders.setOldProjectBenefits(oldOrders.getProjectBenefits());
                 }
@@ -6130,7 +6134,13 @@ public class OrdersServiceImpl extends ServiceImpl<OrdersDao, Orders> implements
         return Result.success();
     }
 
-
+    /**
+     * 技师数据统计
+     * @param artificerId
+     * @param startTime
+     * @param endTime
+     * @return
+     */
     @Override
     public Result selectArtificerIndex(Long artificerId, String startTime, String endTime) {
         Artificer artificer = artificerService.getById(artificerId);