fix(statistics): 兼容 PostgreSQL 统计查询

移植 #1307 的日期、空值、逻辑删除及排序兼容调整。 31 条实际 XML 映射在 MySQL 与 PostgreSQL 各执行 102 次，结果一致。 Refs #1307, #1308

fix(statistics): 兼容 PostgreSQL 统计查询
移植 #1307 的日期、空值、逻辑删除及排序兼容调整。 31 条实际 XML 映射在 MySQL 与 PostgreSQL 各执行 102 次，结果一致。 Refs #1307, #1308
YunaiV
1 parent 1a482667
Showing 9 changed files with 52 additions and 48 deletions
yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/infra/ApiAccessLogStatisticsMapper.xml
yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/member/MemberStatisticsMapper.xml
yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/pay/PayWalletStatisticsMapper.xml
yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/product/ProductStatisticsMapper.xml
yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/trade/AfterSaleStatisticsMapper.xml
yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/trade/BrokerageStatisticsMapper.xml
yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/trade/TradeOrderStatisticsMapper.xml
yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/trade/TradeStatisticsMapper.xml
yudao-module-mall/yudao-module-trade/src/main/resources/mapper/brokerage/BrokerageUserMapper.xml
@@ -7,7 +7,7 @@
         FROM infra_api_access_log
         WHERE user_type = #{userType}
         AND create_time BETWEEN #{beginTime} AND #{endTime}
-        AND deleted = FALSE
+        AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -19,7 +19,7 @@
         WHERE user_id > 0
           AND user_type = #{userType}
           AND create_time BETWEEN #{beginTime} AND #{endTime}
-          AND deleted = FALSE
+          AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -6,7 +6,7 @@
             resultType="cn.iocoder.yudao.module.statistics.service.member.bo.MemberAreaStatisticsRespBO">
         SELECT area_id, COUNT(1) AS userCount
         FROM member_user
-        WHERE deleted = FALSE
+        WHERE deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -17,7 +17,7 @@
             resultType="cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberSexStatisticsRespVO">
         SELECT sex, COUNT(1) AS userCount
         FROM member_user
-        WHERE deleted = FALSE
+        WHERE deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -28,7 +28,7 @@
                          resultType="cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberTerminalStatisticsRespVO">
         SELECT register_terminal as terminal, COUNT(1) AS userCount
         FROM member_user
-        WHERE deleted = FALSE
+        WHERE deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -38,7 +38,7 @@
     <select id="selectUserCount" resultType="java.lang.Integer">
         SELECT COUNT(1)
         FROM member_user
-        WHERE deleted = FALSE
+        WHERE deleted = 0
         <if test="beginTime != null">
             AND create_time >= #{beginTime}
         </if>
@@ -52,15 +52,16 @@
     <select id="selectListByCreateTimeBetween"
             resultType="cn.iocoder.yudao.module.statistics.controller.admin.member.vo.MemberRegisterCountRespVO">
-        SELECT DATE_FORMAT(create_time, '%Y-%m-%d') AS date,
+        SELECT CAST(create_time AS DATE) AS date,
                count(1)                             AS count
         FROM member_user
         WHERE create_time BETWEEN #{beginTime} AND #{endTime}
-          AND deleted = FALSE
+          AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
         GROUP BY date
+        ORDER BY date
     </select>
 </mapper>
@@ -9,7 +9,7 @@
         FROM pay_wallet_recharge
         WHERE pay_status = #{payStatus}
           AND pay_time BETWEEN #{beginTime} AND #{endTime}
-          AND deleted = FALSE
+          AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -22,7 +22,7 @@
         FROM pay_wallet_recharge
         WHERE refund_status = #{refundStatus}
           AND refund_time BETWEEN #{beginTime} AND #{endTime}
-          AND deleted = FALSE
+          AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -33,7 +33,7 @@
         FROM pay_wallet_transaction
         WHERE biz_type = #{bizType}
           AND create_time BETWEEN #{beginTime} AND #{endTime}
-          AND deleted = FALSE
+          AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -51,17 +51,17 @@
         <if test="endTime != null">
             AND pay_time &lt;= #{endTime}
         </if>
-            AND deleted = FALSE
+            AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
     </select>
     <select id="selectRechargePriceSummary" resultType="java.lang.Integer">
-        SELECT IFNULL(SUM(pay_price), 0)
+        SELECT COALESCE(SUM(pay_price), 0)
         FROM pay_wallet_recharge
         WHERE pay_status = #{payStatus}
-          AND deleted = FALSE
+          AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -42,7 +42,7 @@
                 </if>
                 ) AS cart_count
              -- 下单件数
-             , (SELECT IFNULL(SUM(count), 0)
+             , (SELECT COALESCE(SUM(count), 0)
                 FROM trade_order_item
                 WHERE spu_id = spu.id
                   AND create_time BETWEEN #{beginTime} AND #{endTime}
@@ -51,7 +51,7 @@
                 </if>
                 ) AS order_count
              -- 支付件数
-             , (SELECT IFNULL(SUM(item.count), 0)
+             , (SELECT COALESCE(SUM(item.count), 0)
                 FROM trade_order_item item
                          JOIN trade_order o ON item.order_id = o.id
                 WHERE spu_id = spu.id
@@ -63,7 +63,7 @@
                 </if>
                 ) AS order_pay_count
              -- 支付金额
-             , (SELECT IFNULL(SUM(item.pay_price), 0)
+             , (SELECT COALESCE(SUM(item.pay_price), 0)
                 FROM trade_order_item item
                          JOIN trade_order o ON item.order_id = o.id
                 WHERE spu_id = spu.id
@@ -75,7 +75,7 @@
                 </if>
                 ) AS order_pay_price
              -- 退款件数
-             , (SELECT IFNULL(SUM(count), 0)
+             , (SELECT COALESCE(SUM(count), 0)
                 FROM trade_after_sale
                 WHERE spu_id = spu.id
                   AND refund_time IS NOT NULL
@@ -85,7 +85,7 @@
                 </if>
                 ) AS after_sale_count
              -- 退款金额
-             , (SELECT IFNULL(SUM(refund_price), 0)
+             , (SELECT COALESCE(SUM(refund_price), 0)
                 FROM trade_after_sale
                 WHERE spu_id = spu.id
                   AND refund_time IS NOT NULL
@@ -95,7 +95,7 @@
                 </if>
                 ) AS after_sale_refund_price
         FROM product_spu spu
-        WHERE spu.deleted = FALSE
+        WHERE spu.deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND spu.tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -8,7 +8,7 @@
                SUM(refund_price) AS afterSaleRefundPrice
         FROM trade_after_sale
         WHERE refund_time BETWEEN #{beginTime} AND #{endTime}
-          AND deleted = FALSE
+          AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -18,7 +18,7 @@
         SELECT COUNT(1)
         FROM trade_after_sale
         WHERE status = #{status}
-          AND deleted = FALSE
+          AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -8,7 +8,7 @@
         WHERE biz_type = #{bizType}
           AND status = #{status}
           AND unfreeze_time BETWEEN #{beginTime} AND #{endTime}
-          AND deleted = FALSE
+          AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -18,7 +18,7 @@
         SELECT COUNT(1)
         FROM trade_brokerage_withdraw
         WHERE status = #{status}
-          AND deleted = FALSE
+          AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -16,7 +16,7 @@
                 FROM trade_order AS s
                 WHERE s.receiver_area_id = m.receiver_area_id
                   AND s.pay_status = TRUE
-                  AND s.deleted = FALSE
+                  AND s.deleted = 0
                 <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
                     AND s.tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
                 </if>
@@ -25,13 +25,13 @@
                 FROM trade_order AS s
                 WHERE s.receiver_area_id = m.receiver_area_id
                   AND s.pay_status = TRUE
-                  AND s.deleted = FALSE
+                  AND s.deleted = 0
                 <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
                     AND s.tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
                 </if>
                 ) AS orderPayPrice
         FROM trade_order m
-        WHERE deleted = FALSE
+        WHERE deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND m.tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -41,7 +41,7 @@
     <select id="selectUserCountByCreateTimeBetween" resultType="java.lang.Integer">
         SELECT COUNT(DISTINCT (user_id))
         FROM trade_order
-        WHERE deleted = FALSE
+        WHERE deleted = 0
           AND create_time BETWEEN #{beginTime} AND #{endTime}
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
@@ -53,7 +53,7 @@
         FROM trade_order
         WHERE pay_time BETWEEN #{beginTime} AND #{endTime}
           AND pay_status = TRUE
-          AND deleted = FALSE
+          AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -63,7 +63,7 @@
         SELECT COUNT(1)
         FROM trade_order
         WHERE create_time BETWEEN #{beginTime} AND #{endTime}
-          AND deleted = FALSE
+          AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -74,7 +74,7 @@
         FROM trade_order
         WHERE pay_status = TRUE
           AND create_time BETWEEN #{beginTime} AND #{endTime}
-          AND deleted = FALSE
+          AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -84,7 +84,7 @@
         SELECT SUM(pay_price)
         FROM trade_order AS s
         WHERE s.pay_status = TRUE
-          AND deleted = FALSE
+          AND deleted = 0
           AND create_time BETWEEN #{beginTime} AND #{endTime}
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND s.tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
@@ -93,32 +93,35 @@
     <select id="selectListByPayTimeBetweenAndGroupByDay"
             resultType="cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeOrderTrendRespVO">
-        SELECT DATE_FORMAT(pay_time, '%Y-%m-%d') AS date,
+        SELECT CAST(pay_time AS DATE) AS date,
                COUNT(1)                          AS orderPayCount,
                SUM(pay_price)                    AS orderPayPrice
         FROM trade_order
         WHERE pay_status = TRUE
           AND create_time BETWEEN #{beginTime} AND #{endTime}
-          AND deleted = FALSE
+          AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
         GROUP BY date
+        ORDER BY date
     </select>
     <select id="selectListByPayTimeBetweenAndGroupByMonth"
             resultType="cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeOrderTrendRespVO">
-        SELECT DATE_FORMAT(pay_time, '%Y-%m') AS date,
+        SELECT CONCAT(EXTRACT(YEAR FROM pay_time), '-',
+                      LPAD(CONCAT(EXTRACT(MONTH FROM pay_time)), 2, '0')) AS date,
                COUNT(1)                       AS order_pay_count,
                SUM(pay_price)                 AS order_pay_price
         FROM trade_order
         WHERE pay_status = TRUE
           AND create_time BETWEEN #{beginTime} AND #{endTime}
-          AND deleted = FALSE
+          AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
         GROUP BY date
+        ORDER BY date
     </select>
     <select id="selectCountByStatusAndDeliveryType" resultType="java.lang.Long">
@@ -126,7 +129,7 @@
         FROM trade_order
         WHERE status = #{status}
           ANd delivery_type = #{deliveryType}
-          AND deleted = FALSE
+          AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -134,12 +137,12 @@
     <select id="selectPaySummaryByPayStatusAndPayTimeBetween"
             resultType="cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeOrderSummaryRespVO">
-        SELECT IFNULL(SUM(pay_price), 0) AS order_pay_price,
+        SELECT COALESCE(SUM(pay_price), 0) AS order_pay_price,
                COUNT(1)                  AS order_pay_count
         FROM trade_order
         WHERE pay_status = #{payStatus}
           AND pay_time BETWEEN #{beginTime} AND #{endTime}
-          AND deleted = FALSE
+          AND deleted = 0
         <if test="@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId() != null">
             AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()}
         </if>
@@ -4,11 +4,11 @@
     <select id="selectOrderCreateCountSumAndOrderPayPriceSumByTimeBetween"
             resultType="cn.iocoder.yudao.module.statistics.service.trade.bo.TradeSummaryRespBO">
-        SELECT IFNULL(SUM(order_create_count), 0) AS count,
-               IFNULL(SUM(order_pay_price), 0) AS summary
+        SELECT COALESCE(SUM(order_create_count), 0) AS count,
+               COALESCE(SUM(order_pay_price), 0) AS summary
         FROM trade_statistics
         WHERE time BETWEEN #{beginTime} AND #{endTime}
-          AND deleted = FALSE
+          AND deleted = 0
     </select>
     <select id="selectVoByTimeBetween"
@@ -25,14 +25,14 @@
             SUM(after_sale_refund_price)                                                 AS afterSaleRefundPrice
         FROM trade_statistics
         WHERE time BETWEEN #{beginTime} AND #{endTime}
-          AND deleted = FALSE
+          AND deleted = 0
     </select>
     <select id="selectExpensePriceByTimeBetween" resultType="java.lang.Integer">
         SELECT -- 支出金额 = 余额支付金额 + 支付佣金金额 + 商品退款金额
                SUM(wallet_pay_price + brokerage_settlement_price + after_sale_refund_price) AS expensePrice
         FROM trade_statistics
-        WHERE deleted = FALSE
+        WHERE deleted = 0
         <if test="beginTime != null">
             AND time >= #{beginTime}
         </if>
@@ -17,14 +17,14 @@
             resultType="cn.iocoder.yudao.module.trade.controller.app.brokerage.vo.user.AppBrokerageUserChildSummaryRespVO">
         SELECT bu.id, bu.bind_user_time AS brokerageTime,
         (SELECT SUM(price) FROM trade_brokerage_record r
-        WHERE r.user_id = bu.id AND biz_type = #{bizType} AND r.status = #{status} AND r.deleted = FALSE) AS brokeragePrice,
+        WHERE r.user_id = bu.id AND biz_type = #{bizType} AND r.status = #{status} AND r.deleted = 0) AS brokeragePrice,
         (SELECT COUNT(1) FROM trade_brokerage_record r
-        WHERE r.user_id = bu.id AND biz_type = #{bizType} AND r.status = #{status} AND r.deleted = FALSE) AS brokerageOrderCount,
+        WHERE r.user_id = bu.id AND biz_type = #{bizType} AND r.status = #{status} AND r.deleted = 0) AS brokerageOrderCount,
         (SELECT COUNT(1) FROM trade_brokerage_user c
-        WHERE c.bind_user_id = bu.id AND c.deleted = FALSE) AS brokerageUserCount
+        WHERE c.bind_user_id = bu.id AND c.deleted = 0) AS brokerageUserCount
         FROM trade_brokerage_user AS bu
         <where>
-            bu.deleted = false
+            bu.deleted = 0
             <if test="ids != null and ids.size() > 0">
                 and bu.id in
                 <foreach collection="ids" open="(" item="id" separator="," close=")">