diff --git a/yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/infra/ApiAccessLogStatisticsMapper.xml b/yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/infra/ApiAccessLogStatisticsMapper.xml index c307c02..96ebd47 100644 --- a/yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/infra/ApiAccessLogStatisticsMapper.xml +++ b/yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/infra/ApiAccessLogStatisticsMapper.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 AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()} @@ -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 AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()} diff --git a/yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/member/MemberStatisticsMapper.xml b/yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/member/MemberStatisticsMapper.xml index 0c1be40..c156419 100644 --- a/yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/member/MemberStatisticsMapper.xml +++ b/yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/member/MemberStatisticsMapper.xml @@ -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 AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()} @@ -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 AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()} @@ -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 AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()} @@ -38,7 +38,7 @@ - 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 AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()} GROUP BY date + ORDER BY date diff --git a/yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/pay/PayWalletStatisticsMapper.xml b/yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/pay/PayWalletStatisticsMapper.xml index 78403c8..e4b39a9 100644 --- a/yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/pay/PayWalletStatisticsMapper.xml +++ b/yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/pay/PayWalletStatisticsMapper.xml @@ -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 AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()} @@ -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 AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()} @@ -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 AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()} @@ -51,17 +51,17 @@ AND pay_time <= #{endTime} - AND deleted = FALSE + AND deleted = 0 AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()} SELECT COUNT(DISTINCT (user_id)) FROM trade_order - WHERE deleted = FALSE + WHERE deleted = 0 AND create_time BETWEEN #{beginTime} AND #{endTime} 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 AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()} @@ -63,7 +63,7 @@ SELECT COUNT(1) FROM trade_order WHERE create_time BETWEEN #{beginTime} AND #{endTime} - AND deleted = FALSE + AND deleted = 0 AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()} @@ -74,7 +74,7 @@ FROM trade_order WHERE pay_status = TRUE AND create_time BETWEEN #{beginTime} AND #{endTime} - AND deleted = FALSE + AND deleted = 0 AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()} @@ -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} AND s.tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()} @@ -93,32 +93,35 @@ - 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 AND tenant_id = ${@cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder@getTenantId()} diff --git a/yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/trade/TradeStatisticsMapper.xml b/yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/trade/TradeStatisticsMapper.xml index 2415f6d..0a49132 100644 --- a/yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/trade/TradeStatisticsMapper.xml +++ b/yudao-module-mall/yudao-module-statistics/src/main/resources/mapper/trade/TradeStatisticsMapper.xml @@ -4,11 +4,11 @@ SELECT -- 支出金额 = 余额支付金额 + 支付佣金金额 + 商品退款金额 SUM(wallet_pay_price + brokerage_settlement_price + after_sale_refund_price) AS expensePrice FROM trade_statistics - WHERE deleted = FALSE + WHERE deleted = 0 AND time >= #{beginTime} diff --git a/yudao-module-mall/yudao-module-trade/src/main/resources/mapper/brokerage/BrokerageUserMapper.xml b/yudao-module-mall/yudao-module-trade/src/main/resources/mapper/brokerage/BrokerageUserMapper.xml index 69ee4ed..315cc70 100644 --- a/yudao-module-mall/yudao-module-trade/src/main/resources/mapper/brokerage/BrokerageUserMapper.xml +++ b/yudao-module-mall/yudao-module-trade/src/main/resources/mapper/brokerage/BrokerageUserMapper.xml @@ -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 - bu.deleted = false + bu.deleted = 0 and bu.id in