From 3f288c7a0ce4183c1a4f74513c791a03bcbbfb8f Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Tue, 25 Nov 2025 13:22:12 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=87=91=E9=A2=9D=20?=
 =?UTF-8?q?=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/czg/order/entity/ShopOrderStatistic.java     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java
index e6d3e33f7..c5a5f9798 100644
--- a/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java
+++ b/cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java
@@ -434,13 +434,13 @@ public class ShopOrderStatistic implements Serializable {
         result.setRechargeRefundAmount(safeAdd(stat1.getRechargeRefundAmount(), stat2.getRechargeRefundAmount()));
         result.setOnlineRechargeRefundAmount(safeAdd(stat1.getOnlineRechargeRefundAmount(), stat2.getOnlineRechargeRefundAmount()));
         result.setCashRechargeRefundAmount(safeAdd(stat1.getCashRechargeRefundAmount(), stat2.getCashRechargeRefundAmount()));
-        result.setAvgPayAmount(safeAdd(stat1.getAvgPayAmount(), stat2.getAvgPayAmount()));
-        result.setTurnoverRate(safeAdd(stat1.getTurnoverRate(), stat2.getTurnoverRate()));
-        result.setProfitAmount(safeAdd(stat1.getProfitAmount(), stat2.getProfitAmount()));
+//        result.setAvgPayAmount(safeAdd(stat1.getAvgPayAmount(), stat2.getAvgPayAmount()));
+//        result.setTurnoverRate(safeAdd(stat1.getTurnoverRate(), stat2.getTurnoverRate()));
+//        result.setProfitAmount(safeAdd(stat1.getProfitAmount(), stat2.getProfitAmount()));
         result.setProductCostAmount(safeAdd(stat1.getProductCostAmount(), stat2.getProductCostAmount()));
-        result.setProfitRate(safeAdd(stat1.getProfitRate(), stat2.getProfitRate()));
+//        result.setProfitRate(safeAdd(stat1.getProfitRate(), stat2.getProfitRate()));
         result.setNetProfitAmount(safeAdd(stat1.getNetProfitAmount(), stat2.getNetProfitAmount()));
-        result.setNetProfitRate(safeAdd(stat1.getNetProfitRate(), stat2.getNetProfitRate()));
+//        result.setNetProfitRate(safeAdd(stat1.getNetProfitRate(), stat2.getNetProfitRate()));
         result.setDiscountAmount(safeAdd(stat1.getDiscountAmount(), stat2.getDiscountAmount()));
         result.setNewCustomerDiscountAmount(safeAdd(stat1.getNewCustomerDiscountAmount(), stat2.getNewCustomerDiscountAmount()));
         result.setFullDiscountAmount(safeAdd(stat1.getFullDiscountAmount(), stat2.getFullDiscountAmount()));
@@ -462,7 +462,7 @@ public class ShopOrderStatistic implements Serializable {
         result.setNewMemberCount(safeAdd(stat1.getNewMemberCount(), stat2.getNewMemberCount()));
         result.setCustomerCount(safeAdd(stat1.getCustomerCount(), stat2.getCustomerCount()));
         result.setOrderCount(safeAdd(stat1.getOrderCount(), stat2.getOrderCount()));
-        result.setTableCount(safeAdd(stat1.getTableCount(), stat2.getTableCount()));
+        result.setTableCount(stat1.getTableCount());
         result.setDiscountCount(safeAdd(stat1.getDiscountCount(), stat2.getDiscountCount()));
         result.setCashPayCount(safeAdd(stat1.getCashPayCount(), stat2.getCashPayCount()));
         result.setWechatPayCount(safeAdd(stat1.getWechatPayCount(), stat2.getWechatPayCount()));