From 34418b0749d84ae9c29ccfea3d0703ef8746f395 Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Fri, 22 Apr 2022 14:52:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9C=E7=AB=AF=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=B4=E5=BA=A6=EF=BC=8C=E8=AE=A2=E5=8D=95=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=9C=80=E5=A4=9A=E6=9F=A5=E8=AF=A2=E5=8D=8A=E5=B9=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/XhpcStatisticsServiceMapper.java   |  2 +-
 .../com/xhpc/user/mapper/XhpcUserMapper.java  |  2 +-
 .../service/impl/XhpcUserServiceImpl.java     |  4 +-
 .../main/resources/mapper/XhpcUserMapper.xml  | 49 +++++++------------
 4 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java
index 1b885b20..47f757df 100644
--- a/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java
+++ b/xhpc-modules/xhpc-order/src/main/java/com/xhpc/order/mapper/XhpcStatisticsServiceMapper.java
@@ -181,7 +181,7 @@ public interface XhpcStatisticsServiceMapper {
      * @param type            1 平台 2 运营商 3流量方
      * @return
      */
-    List<Map<String,Object>> getSumSourceList(@Param("startTime")String startTime, @Param("endTime")String endTime,@Param("sourceIds")List<String> sourceIds, @Param("userId")Long userId, @Param("type")Integer type,@Param("chargingStationIdList")List<String> chargingStationIdList,@Param("tenantId")String tenantId,@Param("tenantId")Long sysUserId,@Param("tenantId")Integer number);
+    List<Map<String,Object>> getSumSourceList(@Param("startTime")String startTime, @Param("endTime")String endTime,@Param("sourceIds")List<String> sourceIds, @Param("userId")Long userId, @Param("type")Integer type,@Param("chargingStationIdList")List<String> chargingStationIdList,@Param("tenantId")String tenantId,@Param("tenantId")Long sysUserId,@Param("number")Integer number);
 
     /**
      * 获取登陆用户信息
diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcUserMapper.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcUserMapper.java
index 4885945f..9ad26da1 100644
--- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcUserMapper.java
+++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/mapper/XhpcUserMapper.java
@@ -149,5 +149,5 @@ public interface XhpcUserMapper {
 
     public int getOrderTimeNumber(@Param("userId")String userId,@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("tenantId")String tenantId);
 
-    List<Map<String,Object>> getUserDimension(@Param("number")Integer number,@Param("userId")String userId,@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("tenantId")String tenantId,@Param("activity")Integer activity,@Param("frequency")Integer frequency,@Param("amount") BigDecimal amount,@Param("phone")String phone);
+    List<Map<String,Object>> getUserDimension(@Param("userId")String userId,@Param("startTime")String startTime,@Param("endTime")String endTime,@Param("tenantId")String tenantId,@Param("activity")Integer activity,@Param("frequency")Integer frequency,@Param("amount") BigDecimal amount,@Param("phone")String phone);
 }
diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserServiceImpl.java
index 982af13b..cafd2fc9 100644
--- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserServiceImpl.java
+++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcUserServiceImpl.java
@@ -231,9 +231,9 @@ public class XhpcUserServiceImpl extends BaseService implements IXhpcUserService
         String tenantId = loginUser.getTenantId();
 
         //时间范围内的所有订单总数
-        int orderTimeNumber = xhpcUserMapper.getOrderTimeNumber(null, startTime, endTime, tenantId);
+       // int orderTimeNumber = xhpcUserMapper.getOrderTimeNumber(null, startTime, endTime, tenantId);
         startPage();
-        List<Map<String, Object>> userDimension = xhpcUserMapper.getUserDimension(orderTimeNumber, null, startTime, endTime, tenantId,activity,frequency,amount,phone);
+        List<Map<String, Object>> userDimension = xhpcUserMapper.getUserDimension(null, startTime, endTime, tenantId,activity,frequency,amount,phone);
 
         return userDimension;
     }
diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcUserMapper.xml
index f4951e26..05c0fb83 100644
--- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcUserMapper.xml
+++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcUserMapper.xml
@@ -326,36 +326,22 @@
 
     <select id="getUserDimension" resultType="map">
         SELECT
-            us.number number,
-            us.totalPrice totalPrice,
-            us.activity activity,
-            us.appUserId appUserId,
-            us.phone phone
-            from xhpc_app_user AS xaus
-        JOIN (
-            SELECT
-            count(xho.history_order_id) number,
-            IFNULL(SUM(xho.total_price),0) totalPrice,
-            IFNULL(TRUNCATE((count(xho.history_order_id)/#{number})*100,0),0) activity,
-            xau.app_user_id appUserId,
-            xau.phone phone
-            from xhpc_app_user as xau
-            LEFT JOIN xhpc_history_order xho on xau.app_user_id = xho.user_id and xho.source = 0 and xho.tenant_id =#{tenantId}
-            where xau.del_flag =0
-            <if test="startTime !=null and startTime !=''">
-                and xho.end_time &gt;=#{startTime}
-            </if>
-            <if test="endTime !=null and endTime !=''">
-                and xho.end_time &lt;= #{endTime}
-            </if>
-            <if test="phone !=null and phone !=''">
-                and xau.phone like concat('%', #{phone}, '%')
-            </if>
-        GROUP BY xau.app_user_id
-        order by totalPrice desc) us on xaus.app_user_id = us.appUserId
-        where xaus.del_flag = 0
-        <if test="activity !=null">
-            and us.activity &gt;= #{activity}
+        count(xho.history_order_id) number,
+        IFNULL(SUM(xho.total_price),0) totalPrice,
+        xaus.app_user_id appUserId,
+        xaus.phone phone
+        from xhpc_app_user AS xaus
+        LEFT JOIN xhpc_history_order xho on xaus.app_user_id = xho.user_id and xho.source = 0 and xho.tenant_id =#{tenantId}
+        WHERE
+        xaus.del_flag = 0 and YEAR(xho.end_time)=YEAR(NOW())
+        <if test="startTime !=null and startTime !=''">
+            and xho.end_time &gt;=#{startTime}
+        </if>
+        <if test="endTime !=null and endTime !=''">
+            and xho.end_time &lt;= #{endTime}
+        </if>
+        <if test="phone !=null and phone !=''">
+            and xau.phone like concat('%', #{phone}, '%')
         </if>
         <if test="frequency !=null">
             and us.number &gt;= #{frequency}
@@ -370,8 +356,7 @@
             and xaus.user_id = #{userId}
         </if>
         GROUP BY xaus.app_user_id
-        order by totalPrice desc,number desc,activity desc
-
+        order by totalPrice desc,number desc
     </select>