From c23b468a9a605c437c408902e3abc21e2c66cfe5 Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Fri, 20 May 2022 10:12:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=BF=90=E8=90=A5=E5=95=86=E5=AE=9E=E6=94=B6=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xhpc/activity/task/SyncHistoryOrderTask.java | 3 ++-
 .../src/main/java/com/xhpc/card/domain/OrderTrend.java    | 7 +++++++
 .../card/service/impl/XhpcDataBigScreenServiceImpl.java   | 4 +++-
 .../src/main/resources/mapper/XhpcHistoryOrderMapper.xml  | 8 +++++---
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java
index bf058312..27f6540f 100644
--- a/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java
+++ b/xhpc-modules/xhpc-activity/src/main/java/com/xhpc/activity/task/SyncHistoryOrderTask.java
@@ -10,6 +10,7 @@ import com.xhpc.common.core.utils.bean.BeanUtils;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.GetMapping;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -31,7 +32,7 @@ public class SyncHistoryOrderTask {
     /**
      * 每天六点自动同步一天之前所有未同步订单
      */
-    @Scheduled(cron = "0 0 6 * * ? ")
+    @Scheduled(cron = "0 0 0/1 * * ?")
     @Transactional
     void ExpiredTenantStatusTask(){
         System.out.println(" ============== 自动同步订单到清分 开始 ==========================");
diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/OrderTrend.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/OrderTrend.java
index 308bb461..12b77bc3 100644
--- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/OrderTrend.java
+++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/OrderTrend.java
@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @NoArgsConstructor
@@ -40,6 +41,12 @@ public class OrderTrend {
         @JsonProperty("orderNumber")
         private Long orderNumber;
 
+        /**
+         * orderNumber
+         */
+        @JsonProperty("actPrice")
+        private BigDecimal actPrice;
+
     }
 
 }
diff --git a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java
index 6be291ae..ae5de551 100644
--- a/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java
+++ b/xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcDataBigScreenServiceImpl.java
@@ -17,6 +17,7 @@ import com.xhpc.card.service.XhpcDataBigScreenService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 
 /**
@@ -697,7 +698,8 @@ public class XhpcDataBigScreenServiceImpl implements XhpcDataBigScreenService {
         for (Map<String, Object> orderTrendMap : orderTrendList) {
             OrderTrend.DataDTO dataDTO = new OrderTrend.DataDTO();
             dataDTO.setTime((String) orderTrendMap.get("current_time"));
-            dataDTO.setOrderNumber((Long) orderTrendMap.get("sum"));
+            dataDTO.setOrderNumber((Long) orderTrendMap.get("number"));
+            dataDTO.setActPrice(new BigDecimal(orderTrendMap.get("actPrice").toString()));
             orderTrend.getData().add(dataDTO);
         }
         orderTrend.setTotalItems((long) orderTrendList.size());
diff --git a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
index 0a5a77f6..16a29946 100644
--- a/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
+++ b/xhpc-modules/xhpc-card/src/main/resources/mapper/XhpcHistoryOrderMapper.xml
@@ -166,7 +166,8 @@
     <select id="selectOrderTrendByTenantIdsAndChargingStationIds" resultType="java.util.Map">
         SELECT
         `current_time`,
-        IFNULL( sum, 0 ) sum
+        IFNULL( number, 0 ) number,
+        IFNULL( actPrice, 0 ) actPrice
         FROM
         (
         SELECT
@@ -179,7 +180,8 @@
         LEFT JOIN (
         SELECT
         DATE_FORMAT( end_time, "%Y-%m-%d" ) end_time,
-        count( history_order_id ) sum
+        count( history_order_id ) number,
+        sum(act_power_price+act_service_price) actPrice
         FROM
         xhpc_history_order
         WHERE
@@ -193,7 +195,7 @@
                 #{chargingStationId}
             </foreach>
         </if>
-        AND end_time <![CDATA[>=]]> DATE_ADD( now(), INTERVAL - 15 DAY )
+        AND end_time <![CDATA[>=]]> DATE_ADD( FROM_UNIXTIME(UNIX_TIMESTAMP(CAST(SYSDATE()AS DATE))) , INTERVAL - 15 DAY )
         GROUP BY
         DATE_FORMAT( end_time, "%Y-%m-%d" )) b ON a.`current_time` = b.end_time
         ORDER BY