From 50c49e56191d18416da995cf2872b3698afefccc Mon Sep 17 00:00:00 2001
From: khalil <842328916@qq.com>
Date: Tue, 12 Aug 2025 17:27:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B8=E8=BF=9024-=E7=BB=9F=E8=AE=A1-?=
 =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=BB=9F=E8=AE=A1-=E8=B0=83=E6=95=B4sql?=
 =?UTF-8?q?=E5=8E=BB=E9=80=82=E5=BA=94sharding=E7=9A=84=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmappers/Lucky24RecordMapper.xml        | 38 +++++++++----------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/accompany-base/accompany-sharding/accompany-sharding-service/src/main/resources/sharding/sqlmappers/Lucky24RecordMapper.xml b/accompany-base/accompany-sharding/accompany-sharding-service/src/main/resources/sharding/sqlmappers/Lucky24RecordMapper.xml
index 0066a69aa..397ade980 100644
--- a/accompany-base/accompany-sharding/accompany-sharding-service/src/main/resources/sharding/sqlmappers/Lucky24RecordMapper.xml
+++ b/accompany-base/accompany-sharding/accompany-sharding-service/src/main/resources/sharding/sqlmappers/Lucky24RecordMapper.xml
@@ -59,17 +59,17 @@
 
     <select id="listPersonal" resultType="com.accompany.sharding.vo.Lucky24PersonalStat">
         select #{zoneDate} as `date`,
-               #{partitionId} as partition_id,
-            0 as pool_type,
-            r.uid,
-            ifnull(sum(gift_num * gift_gold_price),0) `totalInput`,
-            ifnull(sum(win_gold_num),0) `totalOutput`,
-            ifnull(sum(gift_num * gift_gold_price) - sum(win_gold_num),0) `production`,
-            ifnull(sum(win_gold_num) / sum(gift_num * gift_gold_price),0) `productionRatio`,
-            ifnull(sum(gift_num * gift_gold_price) / count(*),0) `avgInput`,
-            count(*) `num`,
-            count((case when win_gold_num > 0 then r.uid else null end)) `winNum`,
-            ifnull(count((case when win_gold_num > 0 then r.uid else null end)) / count(*),0) `winRate`
+        #{partitionId} as partition_id,
+        0 as pool_type,
+        r.uid,
+        sum(gift_num * gift_gold_price) `totalInput`,
+        sum(win_gold_num) `totalOutput`,
+        sum(gift_num * gift_gold_price) - sum(win_gold_num) `production`,
+        sum(win_gold_num) / sum(gift_num * gift_gold_price) `productionRatio`,
+        sum(gift_num * gift_gold_price) / count(*) `avgInput`,
+        count(*) `num`,
+        count((case when win_gold_num > 0 then r.uid else null end)) `winNum`,
+        count((case when win_gold_num > 0 then r.uid else null end)) / count(*) `winRate`
         from lucky_24_record r force index (lucky_24_record_partition_id_pool_type_create_time_uid_index)
         <if test="null != userRechargeLevel and '' != userRechargeLevel">
             inner join users u on r.uid = u.uid
@@ -77,7 +77,7 @@
         </if>
         where r.partition_id = #{partitionId}
         and r.pool_type in <foreach collection="poolTypeList" item="poolType" separator="," open="(" close=")">#{poolType}</foreach>
-        and r.create_time >= #{startTime} and r.create_time &lt;= #{endTime}
+        and r.create_time between #{startTime} and #{endTime}
         <if test="null != uid">
             and r.uid = #{uid}
         </if>
@@ -89,14 +89,14 @@
         #{partitionId} as partition_id,
         r.pool_type,
         r.uid,
-        ifnull(sum(gift_num * gift_gold_price),0) `totalInput`,
-        ifnull(sum(win_gold_num),0) `totalOutput`,
-        ifnull(sum(gift_num * gift_gold_price) - sum(win_gold_num),0) `production`,
-        ifnull(sum(win_gold_num) / sum(gift_num * gift_gold_price),0) `productionRatio`,
-        ifnull(sum(gift_num * gift_gold_price) / count(*),0) `avgInput`,
+        sum(gift_num * gift_gold_price) `totalInput`,
+        sum(win_gold_num) `totalOutput`,
+        sum(gift_num * gift_gold_price) - sum(win_gold_num) `production`,
+        sum(win_gold_num) / sum(gift_num * gift_gold_price) `productionRatio`,
+        sum(gift_num * gift_gold_price) / count(*) `avgInput`,
         count(*) `num`,
         count((case when win_gold_num > 0 then r.uid else null end)) `winNum`,
-        ifnull(count((case when win_gold_num > 0 then r.uid else null end)) / count(*),0) `winRate`
+        count((case when win_gold_num > 0 then r.uid else null end)) / count(*) `winRate`
         from lucky_24_record r force index (lucky_24_record_partition_id_pool_type_create_time_uid_index)
         <if test="null != userRechargeLevel and '' != userRechargeLevel">
             inner join users u on r.uid = u.uid
@@ -104,7 +104,7 @@
         </if>
         where r.partition_id = #{partitionId}
         and r.pool_type in <foreach collection="poolTypeList" item="poolType" separator="," open="(" close=")">#{poolType}</foreach>
-        and r.create_time >= #{startTime} and r.create_time &lt;= #{endTime}
+        and r.create_time between #{startTime} and #{endTime}
         <if test="null != uid">
             and r.uid = #{uid}
         </if>