cloudroam
2024-10-18 e86890b91f4f579dcac93a90a976c3133c11806e
fix:报表统计
已修改2个文件
7 ■■■■ 文件已修改
src/main/java/com/mzl/flower/dto/response/report/OrderDetailReportResultVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/report/OrderReportMapper.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/mzl/flower/dto/response/report/OrderDetailReportResultVO.java
@@ -29,6 +29,9 @@
    @ApiModelProperty("订单金额")
    private BigDecimal orderTotal;
    @ApiModelProperty("订单金额(实付)")
    private BigDecimal totalAmount;
    @ApiModelProperty("花农底价")
    private BigDecimal orderSupplierPriceAmount;
src/main/resources/mapper/report/OrderReportMapper.xml
@@ -17,7 +17,7 @@
        sum(order_replace_fee)  as order_replace_fee,
        sum(order_fee_supplier)  as order_fee_supplier,
        sum(order_fee_partner)  as order_fee_partner,
        sum(order_fee_platform) + sum(order_fee_packing_transport)  as order_fee_platform,
        sum(order_fee_platform)  as order_fee_platform,
        sum(order_fee_platform_pack)  as order_fee_platform_pack,
        sum(order_fee_platform_check)  as order_fee_platform_check,
        sum(order_fee_platform_transport)  as order_fee_platform_transport,
@@ -264,7 +264,7 @@
        select t2.*,
               IFNULL(t3.fee_supplier,0) as order_fee_supplier,
               IFNULL(t3.fee_partner,0) as order_fee_partner,
               IFNULL(t3.fee_platform,0) as order_fee_platform,
               IFNULL(t3.fee_platform,0) +  IFNULL(t3.fee_packing_transport,0)  as order_fee_platform,
               IFNULL(t3.fee_platform_pack,0) as order_fee_platform_pack,
               IFNULL(t3.fee_platform_check,0) as order_fee_platform_check,
               IFNULL(t3.fee_platform_transport,0) as order_fee_platform_transport,