统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】

owen
1 parent 7aa1ecce
Showing 8 changed files with 15 additions and 16 deletions
sql/mysql/statistics.sql
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/trade/vo/TradeTrendSummaryExcelVO.java
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/controller/admin/trade/vo/TradeTrendSummaryRespVO.java
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/convert/trade/TradeStatisticsConvert.java
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/dal/dataobject/trade/TradeStatisticsDO.java
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/pay/PayWalletStatisticsServiceImpl.java
yudao-module-mall/yudao-module-statistics-biz/src/main/java/cn/iocoder/yudao/module/statistics/service/trade/bo/WalletSummaryRespBO.java
yudao-module-mall/yudao-module-statistics-biz/src/main/resources/mapper/trade/TradeStatisticsMapper.xml
@@ -7,10 +7,10 @@ CREATE TABLE trade_statistics
     order_create_count         int         DEFAULT 0                 NOT NULL COMMENT '创建订单数',
     order_pay_count            int         DEFAULT 0                 NOT NULL COMMENT '支付订单商品数',
     order_pay_price            int         DEFAULT 0                 NOT NULL COMMENT '总支付金额，单位：分',
-    order_wallet_pay_price     int         DEFAULT 0                 NOT NULL COMMENT '总支付金额（余额），单位：分',
     after_sale_count           int         DEFAULT 0                 NOT NULL COMMENT '退款订单数',
     after_sale_refund_price    int         DEFAULT 0                 NOT NULL COMMENT '总退款金额，单位：分',
     brokerage_settlement_price int         DEFAULT 0                 NOT NULL COMMENT '佣金金额（已结算），单位：分',
+    wallet_pay_price           int         DEFAULT 0                 NOT NULL COMMENT '总支付金额（余额），单位：分',
     recharge_pay_count         int         DEFAULT 0                 NOT NULL COMMENT '充值订单数',
     recharge_pay_price         int         DEFAULT 0                 NOT NULL COMMENT '充值金额，单位：分',
     recharge_refund_count      int         DEFAULT 0                 NOT NULL COMMENT '充值退款订单数',
@@ -34,7 +34,7 @@ public class TradeTrendSummaryExcelVO {
     private Integer expensePrice;
     @ExcelProperty(value = "余额支付金额", converter = MoneyConvert.class)
-    private Integer orderWalletPayPrice;
+    private Integer walletPayPrice;
     @ExcelProperty(value = "支付佣金金额", converter = MoneyConvert.class)
     private Integer brokerageSettlementPrice;
@@ -23,7 +23,7 @@ public class TradeTrendSummaryRespVO {
     private Integer orderPayPrice;
     @Schema(description = "余额支付金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
-    private Integer orderWalletPayPrice;
+    private Integer walletPayPrice;
     @Schema(description = "订单退款金额", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Integer afterSaleRefundPrice;
@@ -66,7 +66,7 @@ public interface TradeStatisticsConvert {
                 // 营业额 = 商品支付金额 + 充值金额
                 .setTurnoverPrice(tradeStatistics.getOrderPayPrice() + tradeStatistics.getRechargePayPrice())
                 // 支出金额 = 余额支付金额 + 支付佣金金额 + 商品退款金额
-                .setExpensePrice(tradeStatistics.getOrderWalletPayPrice() + tradeStatistics.getBrokerageSettlementPrice() + tradeStatistics.getAfterSaleRefundPrice());
+                .setExpensePrice(tradeStatistics.getWalletPayPrice() + tradeStatistics.getBrokerageSettlementPrice() + tradeStatistics.getAfterSaleRefundPrice());
     }
     TradeOrderCountRespVO convert(Long undelivered, Long pickUp, Long afterSaleApply, Long auditingWithdraw);
@@ -63,11 +63,10 @@ public class TradeStatisticsDO extends TenantBaseDO {
      */
     private Integer brokerageSettlementPrice;
-    // TODO @疯狂：walletPayPrice，钱包支付金额
     /**
      * 总支付金额（余额），单位：分
      */
-    private Integer orderWalletPayPrice;
+    private Integer walletPayPrice;
     /**
      * 充值订单数
      * <p>
@@ -33,7 +33,7 @@ public class PayWalletStatisticsServiceImpl implements PayWalletStatisticsServic
         Integer walletPayPrice = payWalletStatisticsMapper.selectPriceSummaryByBizTypeAndCreateTimeBetween(
                 beginTime, endTime, PayWalletBizTypeEnum.PAYMENT.getType());
         // 拼接
-        paySummary.setOrderWalletPayPrice(walletPayPrice)
+        paySummary.setWalletPayPrice(walletPayPrice)
                 .setRechargeRefundCount(refundSummary.getRechargeRefundCount())
                 .setRechargeRefundPrice(refundSummary.getRechargeRefundPrice());
         return paySummary;
@@ -13,7 +13,7 @@ public class WalletSummaryRespBO {
     /**
      * 总支付金额（余额），单位：分
      */
-    private Integer orderWalletPayPrice;
+    private Integer walletPayPrice;
     /**
      * 充值订单数
@@ -15,14 +15,14 @@
             resultType="cn.iocoder.yudao.module.statistics.controller.admin.trade.vo.TradeTrendSummaryRespVO">
         SELECT
             -- 营业额 = 商品支付金额 + 充值金额
-            SUM(order_pay_price + recharge_pay_price)                                          AS turnoverPrice,
-            SUM(order_pay_price)                                                               AS orderPayPrice,
-            SUM(recharge_pay_price)                                                            AS rechargePrice,
+            SUM(order_pay_price + recharge_pay_price)                                    AS turnoverPrice,
+            SUM(order_pay_price)                                                         AS orderPayPrice,
+            SUM(recharge_pay_price)                                                      AS rechargePrice,
             -- 支出金额 = 余额支付金额 + 支付佣金金额 + 商品退款金额
-            SUM(order_wallet_pay_price + brokerage_settlement_price + after_sale_refund_price) AS expensePrice,
-            SUM(order_wallet_pay_price)                                                        AS orderWalletPayPrice,
-            SUM(brokerage_settlement_price)                                                    AS brokerageSettlementPrice,
-            SUM(after_sale_refund_price)                                                       AS afterSaleRefundPrice
+            SUM(wallet_pay_price + brokerage_settlement_price + after_sale_refund_price) AS expensePrice,
+            SUM(wallet_pay_price)                                                        AS walletPayPrice,
+            SUM(brokerage_settlement_price)                                              AS brokerageSettlementPrice,
+            SUM(after_sale_refund_price)                                                 AS afterSaleRefundPrice
         FROM trade_statistics
         WHERE time BETWEEN #{beginTime} AND #{endTime}
           AND deleted = FALSE
@@ -30,7 +30,7 @@
     <select id="selectExpensePriceByTimeBetween" resultType="java.lang.Integer">
         SELECT -- 支出金额 = 余额支付金额 + 支付佣金金额 + 商品退款金额
-               SUM(order_wallet_pay_price + brokerage_settlement_price + after_sale_refund_price) AS expensePrice
+               SUM(wallet_pay_price + brokerage_settlement_price + after_sale_refund_price) AS expensePrice
         FROM trade_statistics
         WHERE deleted = FALSE
         <if test="beginTime != null">