From 921b5666d5cb15edfd229998531356f6dce73c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=85=81=E6=9E=9E?= <3422692813@qq.com>
Date: Tue, 15 Oct 2024 13:37:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B010.15?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../order/mapper/AllOrderInfoMapper.java         |  2 ++
 .../order/mapper/xml/AllOrderInfoMapper.xml      | 10 ++++++++++
 .../service/impl/AllOrderInfoServiceImpl.java    | 16 +++++++++++-----
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
index dc8e25523..ba6f63894 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/AllOrderInfoMapper.java
@@ -103,4 +103,6 @@ public interface AllOrderInfoMapper extends BaseMapper<AllOrderInfo> {
 //    IPage<CardValueOrdersVo> getBlanceANdOrder(Page page, @Param("order") CardValueOrdersDTO allOrderInfo);
 
     IPage<AllOrderInfoUniVo> queryAllByLimit(Page page, @Param("allOrderInfo") AllOrderInfoUniVo allOrderInfo);
+
+    Double getCountMemberBalance(@Param("storeId") Integer storeId,@Param("endTime") String endTime);
 }
\ No newline at end of file
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
index 758524e34..16e3159ef 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/AllOrderInfoMapper.xml
@@ -841,6 +841,16 @@
             and  date_format(create_time,'%y%m%d') &lt;= date_format(#{order.params.endTime},'%y%m%d')
         </if>
     </select>
+    <select id="getCountMemberBalance" resultType="java.lang.Double">
+        SELECT
+        SUM(CASE WHEN content like '%充值%' THEN pay_money ELSE 0 END) -
+        SUM(CASE WHEN content like '%订单%' and type = '3' THEN pay_money ELSE 0 END) AS net_pay_money
+        FROM
+        all_order_info
+        WHERE
+        store_id = #{storeId}
+        AND pay_time &lt; #{endTime};
+    </select>
 
     <!--    <where>-->
     <!--        store_id = #{order.storeId}-->
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
index e8c4c2c9f..d3312a1e0 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/AllOrderInfoServiceImpl.java
@@ -2057,12 +2057,16 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
             List<String> oilNames = new ArrayList<>();
             List<Map<String, Object>> oilData = new ArrayList<>();
             oilNames.add("油品交易额");
-            oilNames.add("会员充值金额");
             oilNames.add("非油品交易额");
+            oilNames.add("会员充值金额");
             oilNames.add("会员消费金额");
+            oilNames.add("会员余额");
+
+            //查询会员余额
             for (String time : allDatesBetween) {
                 DateTime dateTime = DateUtil.beginOfDay(DateUtil.parse(time));
                 DateTime dateTime1 = DateUtil.endOfDay(dateTime);
+                Double memberBalance = allOrderInfoMapper.getCountMemberBalance(nowAccountInfo.getStoreId(), dateTime1.toString());
                 Map<String, Object> params = new HashMap<>();
                 params.put("time", time);
                 List<Double> money = new ArrayList<>();
@@ -2070,18 +2074,20 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
                 List<AllOrderInfo> oilOrder = filterOrders(allOrderInfos, dateTime, dateTime1, "1", null, null);
                 double sum = oilOrder.stream().mapToDouble(AllOrderInfo::getPayMoney).sum();
                 money.add(sum);
-                //会员充值金额
-                List<AllOrderInfo> mtTopUp = filterOrders(allOrderInfos, dateTime, dateTime1, null, "充值", null);
-                double mtSum = mtTopUp.stream().mapToDouble(AllOrderInfo::getPayMoney).sum();
-                money.add(mtSum);
                 //非油品交易额
                 List<AllOrderInfo> otherOrder = filterOrders(allOrderInfos, dateTime, dateTime1, null, null, "2");
                 double otherSum = otherOrder.stream().mapToDouble(AllOrderInfo::getPayMoney).sum();
                 money.add(otherSum);
+                //会员充值金额
+                List<AllOrderInfo> mtTopUp = filterOrders(allOrderInfos, dateTime, dateTime1, null, "充值", null);
+                double mtSum = mtTopUp.stream().mapToDouble(AllOrderInfo::getPayMoney).sum();
+                money.add(mtSum);
                 //会员消费金额
                 List<AllOrderInfo> userOrder = filterOrders(allOrderInfos, dateTime, dateTime1, null, "订单", null);
                 double userSum = userOrder.stream().mapToDouble(AllOrderInfo::getPayMoney).sum();
                 money.add(userSum);
+                //会员余额
+                money.add(memberBalance);
 
                 params.put("money", money);
                 oilData.add(params);