From 1dd8dc4508db573f790a2207d26d34c58ad6ea0a Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 11 Sep 2024 16:52:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E4=B8=9A=E6=9D=BF=E5=9D=97=20?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/ysk/cashier/pojo/shop/TbShopInfo.java    |  2 +-
 .../service/impl/SummaryServiceImpl.java        | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java
index 6bd14fa1..103fc7bb 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java
@@ -266,7 +266,7 @@ public class TbShopInfo implements Serializable {
     @ApiModelProperty(value = "是否免除桌位费 0否1是")
     private Integer isTableFee;
 
-    @Column(name = "tableFee")
+    @Column(name = "table_fee")
     @ApiModelProperty(value = "桌位费")
     private BigDecimal tableFee;
 
diff --git a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
index a3659869..25a34a9b 100644
--- a/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
+++ b/eladmin-system/src/main/java/cn/ysk/cashier/service/impl/SummaryServiceImpl.java
@@ -90,11 +90,18 @@ public class SummaryServiceImpl implements SummaryService {
         Integer newFlow = tbShopUserFlowMapper.tradeIndexNewFlow(param.getShopId(), DateUtil.getStrTime(param.getStartTime()), DateUtil.getStrTime(param.getEndTime()));
         //台桌数
         int tables = tbShopTableRepository.countAllByShopId(param.getShopId());
-        sale.put("totalSaleAmount", new BigDecimal(orderMap.get("saleAmount").toString()).add(refundAmount));//总金额
-        sale.put("incomeAmount", new BigDecimal(orderMap.get("saleAmount").toString()).add(new BigDecimal(flowMap.get("inAmount").toString())));//实收
-        sale.put("refundAmount", refundAmount);//销售退款金额
-        sale.put("inAmount", flowMap.get("inAmount"));//会员充值金额
-        sale.put("outAmount", flowMap.get("outAmount"));//会员退款金额
+        //收款金额
+        BigDecimal incomeAmount = new BigDecimal(orderMap.get("saleAmount").toString()).subtract(new BigDecimal(orderMap.get("saveAmount").toString()));//订单金额 - 优惠金额
+        sale.put("totalSaleAmount", incomeAmount.add(refundAmount));//总金额 销售收款金额＋销售退款金额
+        sale.put("incomeAmount", incomeAmount);//销售 收款金额
+        sale.put("refundAmount", refundAmount);//销售 退款金额
+
+        sale.put("totalVipAmount", new BigDecimal(flowMap.get("inAmount").toString()).add(new BigDecimal(flowMap.get("outAmount").toString())));//会员总金额
+        sale.put("inAmount", flowMap.get("inAmount")); //会员 充值金额
+        sale.put("outAmount", flowMap.get("outAmount"));//会员 退款金额
+
+        sale.put("incomeAmountAll",incomeAmount.add(new BigDecimal(flowMap.get("inAmount").toString())));//总实收 销售实收+会员实收
+
         result.put("sale",sale);
         vip.put("useAmount", flowMap.get("useAmount"));//会员消费金额
         vip.put("newFlow",newFlow);//新增会员数