1.花材统计报表：增加父类名称

陶杰

2024-12-21 ae3dd677f3bbbc26d7c41aebc0e6048e2d20593c

 src/main/java/com/mzl/flower/dto/response/report/OrderPartnerReportResultVO.java

@@ -6,15 +6,14 @@
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;

@Data
public class OrderPartnerReportResultVO {

    @ApiModelProperty("下单日期")
    @JsonFormat(pattern="yyyy-MM-dd" ,timezone="GMT+8")
    @DateTimeFormat(pattern="yyyy-MM-dd")
    private LocalDateTime orderDate;
    private String orderDate;

    @ApiModelProperty("销售额")
    private BigDecimal orderTotal;
@@ -29,20 +28,20 @@
    private BigDecimal orderPartnerPriceAmount;


    @ApiModelProperty("平台区间加价")
    private BigDecimal orderMarkupOneAmount;
//    @ApiModelProperty("平台区间加价")
//    private BigDecimal orderMarkupOneAmount;

    @ApiModelProperty("平台加价")
    private BigDecimal orderMarkupTwoAmount;

    @ApiModelProperty("平台区域加价--暂无")
    private BigDecimal platformAreaFeeAmount;
//    @ApiModelProperty("平台加价")
//    private BigDecimal orderMarkupTwoAmount;
//
//    @ApiModelProperty("平台区域加价--暂无")
//    private BigDecimal platformAreaFeeAmount;

    @ApiModelProperty("合伙人加价")
    private BigDecimal orderMarkupPartnerAmount;

    @ApiModelProperty("合伙人区间加价--暂无")
    private BigDecimal partnerSectionFeeAmount;
//    @ApiModelProperty("合伙人区间加价--暂无")
//    private BigDecimal partnerSectionFeeAmount;

    @ApiModelProperty("会员折扣")
    private BigDecimal orderPriceDiscountAmount;
@@ -56,9 +55,21 @@
    @ApiModelProperty("总包干费--暂无")
    private BigDecimal partnerTotalFeeAmount;

    @ApiModelProperty("总销售扎数")
    private Integer orderNum;

    @ApiModelProperty("实际销售扎数")
    private Integer realSaleNum;

    @ApiModelProperty("缺货扎数")
    private BigDecimal orderLackNum;

    @ApiModelProperty("降级扎数")
    private BigDecimal orderReduceNum;

    @ApiModelProperty("补货扎数")
    private BigDecimal orderReplaceNum;

//    @ApiModelProperty("利润--总包干费没有无法计算")
//    private BigDecimal profitFeeAmount;
//