经营日报/日结单

cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java

@@ -141,6 +141,8 @@ public class ShopOrderStatistic implements Serializable {
      */
     @ExcelProperty("现金支付金额")
     private BigDecimal cashPayAmount;
+    @ExcelIgnore
+    private BigDecimal cashPayAmountOriginal;
     /**
      * 现金支付笔数
      */
@@ -151,6 +153,8 @@ public class ShopOrderStatistic implements Serializable {
      */
     @ExcelProperty("微信小程序支付金额")
     private BigDecimal wechatPayAmount;
+    @ExcelIgnore
+    private BigDecimal wechatPayAmountOriginal;
     /**
      * 微信小程序支付笔数
      */
@@ -161,6 +165,8 @@ public class ShopOrderStatistic implements Serializable {
      */
     @ExcelProperty("支付宝小程序支付金额")
     private BigDecimal alipayPayAmount;
+    @ExcelIgnore
+    private BigDecimal alipayPayAmountOriginal;
     /**
      * 支付宝小程序支付笔数
      */
@@ -171,6 +177,8 @@ public class ShopOrderStatistic implements Serializable {
      */
     @ExcelProperty("扫码收款金额")
     private BigDecimal backScanPayAmount;
+    @ExcelIgnore
+    private BigDecimal backScanPayAmountOriginal;
     /**
      * 被扫收款笔数
      */
@@ -181,6 +189,8 @@ public class ShopOrderStatistic implements Serializable {
      */
     @ExcelProperty("二维码收款金额")
     private BigDecimal mainScanPayAmount;
+    @ExcelIgnore
+    private BigDecimal mainScanPayAmountOriginal;
     /**
      * 二维码收款笔数
      */
@@ -191,6 +201,8 @@ public class ShopOrderStatistic implements Serializable {
      */
     @ExcelProperty("挂账支付金额")
     private BigDecimal creditPayAmount;
+    @ExcelIgnore
+    private BigDecimal creditPayAmountOriginal;
     /**
      * 挂账支付笔数
      */
@@ -202,6 +214,8 @@ public class ShopOrderStatistic implements Serializable {
      */
     @ExcelProperty("会员消费金额")
     private BigDecimal memberPayAmount;
+    @ExcelIgnore
+    private BigDecimal memberPayAmountOriginal;
     /**
      * 会员消费笔数
      */
@@ -221,6 +235,9 @@ public class ShopOrderStatistic implements Serializable {
      */
     @ExcelProperty("订单退款金额")
     private BigDecimal refundAmount;
+
+    @ExcelIgnore
+    private Long refundCount;
     @ExcelProperty("订单挂账退款金额")
     private BigDecimal creditRefundAmount;
     /**
@@ -389,12 +406,63 @@ public class ShopOrderStatistic implements Serializable {
     @ExcelProperty("净利润率(%)")
     private BigDecimal netProfitRate;
 
+    /**
+     * 抖音团购
+     */
     @ExcelIgnore
     private BigDecimal douyinGroup;
 
+    /**
+     * 美团团购
+     */
     @ExcelIgnore
     private BigDecimal meituanGroup;
 
+    /**
+     * 整单退款数量
+     */
+    @ExcelIgnore
+    private Long refundAllNum;
+
+    /**
+     * 整单退款金额
+     */
+    @ExcelIgnore
+    private BigDecimal refundAllAmount;
+
+    /**
+     * 单菜品退款数量
+     */
+    @ExcelIgnore
+    private Long refundItemNum;
+    /**
+     * 单菜品退款金额
+     */
+    @ExcelIgnore
+    private BigDecimal refundItemAmount;
+
+    /**
+     * 折扣订单数量
+     */
+    @ExcelIgnore
+    private Long discountOrderNum;
+    /**
+     * 折扣订单金额
+     */
+    @ExcelIgnore
+    private BigDecimal discountOrderAmount;
+
+    /**
+     * 待支付订单数量
+     */
+    @ExcelIgnore
+    private Long unpaidOrderNum;
+    /**
+     * 待支付订单金额
+     */
+    @ExcelIgnore
+    private BigDecimal unpaidOrderAmount;
+
     /**
      * 创建时间
      */