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

---
 fuintAdmin/src/views/shopowner.vue            |  5 +--
 .../order/mapper/xml/OilOrderMapper.xml       |  2 +-
 .../service/impl/AllOrderInfoServiceImpl.java | 38 ++++++++++++++++++-
 3 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/fuintAdmin/src/views/shopowner.vue b/fuintAdmin/src/views/shopowner.vue
index b1d17521c..19cf0ad12 100644
--- a/fuintAdmin/src/views/shopowner.vue
+++ b/fuintAdmin/src/views/shopowner.vue
@@ -325,7 +325,7 @@ export default {
     this.getDataCount()
   },
   mounted() {
-    // this.initChart()
+    this.initChart()
   },
   methods: {
     goList() {
@@ -364,7 +364,7 @@ export default {
           console.log('dataAnalysisOilNumberList',this.dataAnalysisOilNumberList)
           console.log('dataAnalysisIfOilList',this.dataAnalysisIfOilList)
           console.log('dataAnalysisAllList',this.dataAnalysisAllList)
-          // this.initChart()
+          this.initChart()
         }
       })
     },
@@ -513,7 +513,6 @@ export default {
             //   { value: 40, name: '#95汽油占比' },
             //   { value: 38, name: '#92柴油占比' },
             //
-            //
             // ],
             data: this.dataAnalysisOilNumberList,
             emphasis: {
diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
index 3bdda0435..6ef1538a7 100644
--- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
+++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/mapper/xml/OilOrderMapper.xml
@@ -806,6 +806,6 @@
     </select>
     <select id="selectSumMoneyByDayAndOilNumber" resultType="java.lang.Double">
         select IFNULL(SUM(pay_amount), 0) from oil_order
-        where DATE(pay_time) = #{day} and oils = #{oilName} and store_id = #{storeId}
+        where DATE(pay_time) = #{day} and oils = #{oilName} and store_id = #{storeId} and order_status = "paid"
     </select>
 </mapper>
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 9ec00fd5b..e8c4c2c9f 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
@@ -1875,14 +1875,24 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
             homeDataShowVo.setOilNames(oilNames);
             //根据开始时间与结束时间获取所有天数
             List<String> days = getAllDatesBetween(startTime, endTime);
+            //查询所有订单
+            DateTime dateTime2 = DateUtil.beginOfDay(DateUtil.parse(startTime));
+            DateTime dateTime3 = DateUtil.endOfDay(DateUtil.parse(endTime));
+            List<OilOrder> oilOrders = oilOrderMapper.selectList(new LambdaQueryWrapper<OilOrder>()
+                    .eq(OilOrder::getStoreId, nowAccountInfo.getStoreId())
+                    .eq(OilOrder::getOrderStatus, "paid")
+                    .between(OilOrder::getPayTime, dateTime2, dateTime3));
             List<Map<String, Object>> oilData = new ArrayList<>();
             for (String day : days) {
                 Map<String, Object> mapData = new HashMap<>();
                 mapData.put("day", day);
                 List<Double> oilPrices = new ArrayList<>();
+                DateTime dateTime = DateUtil.beginOfDay(DateUtil.parse(day));
+                DateTime dateTime1 = DateUtil.endOfDay(dateTime);
                 for (OilNumber oilNumber : oilNumbers) {
                     //查询油品交易总金额
-                    double price = oilOrderMapper.selectSumMoneyByDayAndOilNumber(oilNumber.getOilName(), day, nowAccountInfo.getStoreId());
+//                    double price = oilOrderMapper.selectSumMoneyByDayAndOilNumber(oilNumber.getOilName(), day, nowAccountInfo.getStoreId());
+                    double price = calculateTotalPayAmount(oilOrders, dateTime, dateTime1, oilNumber.getOilName());
                     oilPrices.add(price);
                 }
                 mapData.put("oilPrices", oilPrices);
@@ -1914,6 +1924,32 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper, All
         return dateList;
     }
 
+    /**
+     * 计算指定支付时间范围和油品名称下的累计支付金额
+     *
+     * @param oilOrders  OilOrder对象的集合
+     * @param startTime  支付开始时间
+     * @param endTime    支付结束时间
+     * @param oilName    目标油品名称
+     * @return           符合条件的累计支付金额
+     */
+    public static double calculateTotalPayAmount(List<OilOrder> oilOrders, Date startTime, Date endTime, String oilName) {
+        double totalPayAmount = 0.0;
+
+        for (OilOrder order : oilOrders) {
+            // 检查支付时间是否在范围内，油品名称是否匹配（若oilName不为空则匹配）
+            if ((startTime == null || !order.getPayTime().before(startTime))
+                    && (endTime == null || !order.getPayTime().after(endTime))
+                    && (oilName == null || Objects.equals(order.getOils(), oilName))) {
+
+                // 累加符合条件的订单的payAmount
+                totalPayAmount += order.getPayAmount();
+            }
+        }
+
+        return totalPayAmount;
+    }
+
     private static String getFormattedResult(double averageValue) {
         DecimalFormat df = new DecimalFormat("#.00");
         String formattedResult = df.format(averageValue);