前台退菜单 默认打印

cash-common/cash-common-service/src/main/java/com/czg/order/dto/OrderInfoRefundDTO.java

@@ -53,7 +53,7 @@ public class OrderInfoRefundDTO implements Serializable {
     /**
      * 是否打印退菜/退款票
      */
-    private boolean print;
+    private boolean print = true;
     /**
      * 是否退库存
      */

cash-common/cash-common-service/src/main/java/com/czg/print/DayReportPrintDTO.java

@@ -32,52 +32,101 @@ public class DayReportPrintDTO implements Serializable {
      */
     private String statisticsTime;
 
-    /**
-     * 退款金额
-     */
-    private BigDecimal refundAmount;
-    /**
-     * 退菜数量
-     */
-    private Long returnDishCount;
     /**
      * 营业额
      */
-    private TurnoverSts turnover;
-
+    private BusinessSts turnover;
     /**
-     * 订单
+     * 收入来源
+     * 原价统计金额
      */
-    private OrderSts order;
-
+    private Income sourceIncome;
     /**
-     * 数据统计
+     * 实收统计
+     * 实际收入统计金额
+     *
      */
-    private Sts sts;
-
-
+    private Income actualIncome;
 
     /**
-     * 营业额 类
+     * 优惠统计
+     */
+    private DiscountSts discountSta;
+
+    /**
+     * 营业统计
      */
     @Data
     @Accessors(chain = true)
-    public static class TurnoverSts {
-
+    public static class BusinessSts {
+        /**
+         * 订单原价总额
+         */
+        private BigDecimal originAmount;
         /**
          * 营业额
          */
         private BigDecimal turnover;
+        /**
+         * 优惠金额
+         */
+        private BigDecimal discountAmount;
+        /**
+         * 订单总数
+         */
+        private Long orderCount;
+        /**
+         * 折前单均价
+         * 订单原价总额/订单数量（含退款）
+         */
+        private BigDecimal averageOrderAmount;
+        /**
+         * 折后单均价
+         * 营业额/订单数量（含退款）
+         */
+        private BigDecimal averageTurnover;
+        /**
+         * 退款金额
+         */
+        private BigDecimal refundAmount;
+        /**
+         * 退款订单数
+         */
+        private Long refundOrderCount;
+    }
 
+
+    /**
+     * 收入统计类
+     */
+    @Data
+    @Accessors(chain = true)
+    public static class Income {
+        /**
+         * 现金收款
+         */
+        private BigDecimal cash;
         /**
          * 微信支付金额
          */
         private BigDecimal wechat;
-
         /**
          * 支付宝支付金额
          */
         private BigDecimal alipay;
+        /**
+         * 美团团购
+         */
+        private BigDecimal meituan;
+        /**
+         * 抖音团购
+         */
+        private BigDecimal douyin;
+        /**
+         * 其他
+         */
+        private BigDecimal other;
+
 
         /**
          * 二维码收款
@@ -88,11 +137,6 @@ public class DayReportPrintDTO implements Serializable {
          */
         private BigDecimal barScan;
 
-        /**
-         * 现金收款
-         */
-        private BigDecimal cash;
-
         /**
          * 充值
          */
@@ -109,54 +153,45 @@ public class DayReportPrintDTO implements Serializable {
         private BigDecimal balance;
     }
 
-    /**
-     * 订单 类
-     */
-    @Data
-    @Accessors(chain = true)
-    public static class OrderSts {
-        /**
-         * 订单金额
-         */
-        private BigDecimal orderAmount;
-
-        /**
-         * 订单总数
-         */
-        private Long orderCount;
-    }
-
-
     /**
      * 数据统计 类
      */
     @Data
     @Accessors(chain = true)
-    public static class Sts {
+    public static class DiscountSts {
         /**
-         * 就餐人数
+         * 新客立减
          */
-        private Long customerCount;
+        private BigDecimal newConsumerDiscount;
+
         /**
-         * 客单价
-         * 实付金额(包含现金支付 包含会员支付 包含挂账)/就餐人数
-         * 没有具体人数时，默认一桌按照1人计算
+         * 霸王餐
          */
-        private BigDecimal avgPayAmount;
+        private BigDecimal freeCashAmount;
+
         /**
-         * 翻台率
-         * （订单数-桌台数）/桌台数*100%
+         * 满减活动
          */
-        private BigDecimal turnoverRate;
+        private BigDecimal fullMinusAmount;
+
         /**
-         * 商品成本
+         * 优惠券
          */
-        private BigDecimal productCostAmount;
+        private BigDecimal couponAmount;
+
         /**
-         * 毛利率（订单实付金额-商品成本）/订单实付金额*100%
+         * 会员折扣
          */
-        private BigDecimal profitRate;
+        private BigDecimal memberDiscount;
+
+        /**
+         * 积分抵扣金额
+         */
+        private BigDecimal pointsDiscountAmount;
+
+        /**
+         * 订单改价
+         */
+        private BigDecimal orderDiscount;
     }
-
-
 }

cash-common/cash-common-service/src/main/java/com/czg/print/DaySettlePrintDTO.java

@@ -0,0 +1,195 @@
+package com.czg.print;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * 日结单
+ *
+ * @author ww
+ */
+@Data
+@Accessors(chain = true)
+public class DaySettlePrintDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+    /**
+     * 店铺名称
+     */
+    private String shopName;
+
+    /**
+     * 操作人
+     */
+    private String operator;
+
+    /**
+     * 统计时间
+     */
+    private String statisticsTime;
+
+    /**
+     * 营业统计
+     */
+    private BusinessSts turnover;
+    /**
+     * 收款构成
+     */
+    private Income income;
+
+    /**
+     * 优惠统计
+     */
+    private DiscountSts discountSta;
+
+    /**
+     * 敏感操作记录
+     * 退单/退菜/折扣/未结款
+     * 退单：仅统计整单退款（订单全额退款）的数据
+     * 退菜：仅统计单菜品退款的数据
+     * 折扣：使用任一折扣的订单数量和折扣金额
+     * 未结款：当天有待支付订单的数量和应付金额
+     */
+    private List<OperationRecord> operationRecords;
+
+    /**
+     * 营业统计
+     */
+    @Data
+    @Accessors(chain = true)
+    public static class BusinessSts {
+        /**
+         * 订单原价总额
+         */
+        private BigDecimal originAmount;
+        /**
+         * 营业额
+         */
+        private BigDecimal turnover;
+        /**
+         * 优惠金额
+         */
+        private BigDecimal discountAmount;
+        /**
+         * 订单总数
+         */
+        private Long orderCount;
+        /**
+         * 退款订单数
+         */
+        private Long refundOrderCount;
+        /**
+         * 退款金额
+         */
+        private BigDecimal refundAmount;
+
+        /**
+         * 现金收款
+         */
+        private BigDecimal cash;
+        /**
+         * 备用金
+         */
+        private BigDecimal reserve;
+        /**
+         * 钱箱剩余
+         */
+        private BigDecimal cashBoxRemaining;
+    }
+
+
+    /**
+     * 收入统计类
+     */
+    @Data
+    @Accessors(chain = true)
+    public static class Income {
+        /**
+         * 现金收款
+         */
+        private BigDecimal cash;
+        /**
+         * 微信支付金额
+         */
+        private BigDecimal wechat;
+        /**
+         * 支付宝支付金额
+         */
+        private BigDecimal alipay;
+        /**
+         * 团购
+         */
+        private BigDecimal group;
+    }
+
+    /**
+     * 优惠统计 类
+     */
+    @Data
+    @Accessors(chain = true)
+    public static class DiscountSts {
+        /**
+         * 新客立减
+         */
+        private BigDecimal newConsumerDiscount;
+
+        /**
+         * 霸王餐
+         */
+        private BigDecimal freeCashAmount;
+
+        /**
+         * 满减活动
+         */
+        private BigDecimal fullMinusAmount;
+
+        /**
+         * 优惠券
+         */
+        private BigDecimal couponAmount;
+
+        /**
+         * 会员折扣
+         */
+        private BigDecimal memberDiscount;
+
+        /**
+         * 积分抵扣金额
+         */
+        private BigDecimal pointsDiscountAmount;
+
+        /**
+         * 订单改价
+         */
+        private BigDecimal orderDiscount;
+    }
+
+    /**
+     * 敏感操作记录
+     */
+    @Data
+    @Accessors(chain = true)
+    public static class OperationRecord {
+
+        /**
+         * 操作类型
+         */
+        private String operation;
+
+        /**
+         * 数量
+         */
+        private Long count;
+
+        /**
+         * 金额
+         */
+        private BigDecimal amount;
+    }
+}