Merge remote-tracking branch 'origin/master'

cash-common/cash-common-service/src/main/java/com/czg/account/entity/PrintMachine.java

@@ -8,6 +8,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 
 import java.io.Serial;
+import java.util.List;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -87,7 +88,7 @@ public class PrintMachine implements Serializable {
     /**
      * 分类
      */
-    private String categoryList;
+    private List<Object> categoryList;
 
     /**
      * 排序

cash-common/cash-common-service/src/main/java/com/czg/account/entity/ShopTableOrderStatistic.java

@@ -49,6 +49,14 @@ public class ShopTableOrderStatistic implements Serializable {
      * 订单金额
      */
     private BigDecimal orderAmount;
+    /**
+     * 退款金额
+     */
+    private BigDecimal refundAmount;
+    /**
+     * 退款金额
+     */
+    private Long refundCount;
 
     /**
      * 店铺id

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

@@ -0,0 +1,120 @@
+
+package com.czg.order.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Date;
+import java.io.Serial;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  实体类。
+ *
+ * @author zs
+ * @since 2025-03-07
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ShopOrderStatisticDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Integer id;
+
+    /**
+     * 销售额
+     */
+    private BigDecimal saleAmount;
+
+    /**
+     * 销售数量
+     */
+    private Long saleCount;
+
+    /**
+     * 优惠金额
+     */
+    private BigDecimal discountAmount;
+
+    /**
+     * 优惠笔数
+     */
+    private Long discountCount;
+
+    /**
+     * 退款金额
+     */
+    private BigDecimal refundAmount;
+
+    /**
+     * 退款笔数
+     */
+    private Long refundCount;
+
+    /**
+     * 微信支付笔数
+     */
+    private Long wechatPayCount;
+
+    /**
+     * 位置支付金额
+     */
+    private BigDecimal wechatPayAmount;
+
+    /**
+     * 支付宝支付笔数
+     */
+    private Long aliPayCount;
+
+    /**
+     * 支付宝支付金额
+     */
+    private BigDecimal aliPayAmount;
+
+    /**
+     * 挂账支付笔数
+     */
+    private Long creditPayCount;
+
+    /**
+     * 挂账支付金额
+     */
+    private BigDecimal creditPayAmount;
+
+    /**
+     * 会员支付笔数
+     */
+    private Long memberPayCount;
+
+    /**
+     * 会员支付金额
+     */
+    private BigDecimal memberPayAmount;
+
+    /**
+     * 主扫支付笔数
+     */
+    private Long scanPayCount;
+
+    /**
+     * 主扫支付金额
+     */
+    private BigDecimal scanPayAmount;
+
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+
+    /**
+     * 创建时间
+     */
+    private Date createDay;
+
+}

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

@@ -0,0 +1,65 @@
+
+package com.czg.order.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Date;
+import java.io.Serial;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  实体类。
+ *
+ * @author zs
+ * @since 2025-03-07
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ShopProdStatisticDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 商品id
+     */
+    private Long prodId;
+
+    /**
+     * 销售数量
+     */
+    private Long saleNum;
+
+    /**
+     * 销售金额
+     */
+    private BigDecimal saleAmount;
+
+    /**
+     * 退单量
+     */
+    private Long refundNum;
+
+    /**
+     * 退单金额
+     */
+    private BigDecimal refundAmount;
+
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+
+    /**
+     * 创建时间
+     */
+    private Date createDay;
+
+}

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

@@ -0,0 +1,52 @@
+
+package com.czg.order.dto;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Date;
+import java.io.Serial;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 台桌订单统计表 实体类。
+ *
+ * @author zs
+ * @since 2025-03-07
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ShopTableOrderStatisticDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private Long tableId;
+
+    /**
+     * 订单数量
+     */
+    private Long orderCount;
+
+    /**
+     * 订单金额
+     */
+    private BigDecimal orderAmount;
+
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+
+    /**
+     * 创建日期 年月日
+     */
+    private Date createDay;
+
+}

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

@@ -0,0 +1,128 @@
+package com.czg.order.entity;
+
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Date;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  实体类。
+ *
+ * @author zs
+ * @since 2025-03-07
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_order_statistic")
+public class ShopOrderStatistic implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id(keyType = KeyType.Auto)
+    private Integer id;
+
+    /**
+     * 销售额
+     */
+    private BigDecimal saleAmount = BigDecimal.ZERO;
+
+    /**
+     * 销售数量
+     */
+    private Long saleCount = 0L;
+
+    /**
+     * 优惠金额
+     */
+    private BigDecimal discountAmount = BigDecimal.ZERO;
+
+    /**
+     * 优惠笔数
+     */
+    private Long discountCount = 0L;
+
+    /**
+     * 退款金额
+     */
+    private BigDecimal refundAmount = BigDecimal.ZERO;
+
+    /**
+     * 退款笔数
+     */
+    private Long refundCount = 0L;
+
+    /**
+     * 微信支付笔数
+     */
+    private Long wechatPayCount = 0L;
+
+    /**
+     * 位置支付金额
+     */
+    private BigDecimal wechatPayAmount = BigDecimal.ZERO;
+
+    /**
+     * 支付宝支付笔数
+     */
+    private Long aliPayCount = 0L;
+
+    /**
+     * 支付宝支付金额
+     */
+    private BigDecimal aliPayAmount = BigDecimal.ZERO;
+
+    /**
+     * 挂账支付笔数
+     */
+    private Long creditPayCount = 0L;
+
+    /**
+     * 挂账支付金额
+     */
+    private BigDecimal creditPayAmount = BigDecimal.ZERO;
+
+    /**
+     * 会员支付笔数
+     */
+    private Long memberPayCount = 0L;
+
+    /**
+     * 会员支付金额
+     */
+    private BigDecimal memberPayAmount = BigDecimal.ZERO;
+
+    /**
+     * 主扫支付笔数
+     */
+    private Long scanPayCount = 0L;
+
+    /**
+     * 主扫支付金额
+     */
+    private BigDecimal scanPayAmount = BigDecimal.ZERO;
+    private Long cashPayCount = 0L;
+    private BigDecimal cashPayAmount = BigDecimal.ZERO;
+
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+
+    /**
+     * 创建时间
+     */
+    private Date createDay;
+
+}

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

@@ -0,0 +1,71 @@
+package com.czg.order.entity;
+
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Date;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *  实体类。
+ *
+ * @author zs
+ * @since 2025-03-07
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_prod_statistic")
+public class ShopProdStatistic implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    /**
+     * 商品id
+     */
+    private Long prodId;
+
+    /**
+     * 销售数量
+     */
+    private BigDecimal saleCount;
+
+    /**
+     * 销售金额
+     */
+    private BigDecimal saleAmount;
+
+    /**
+     * 退单量
+     */
+    private BigDecimal refundCount;
+
+    /**
+     * 退单金额
+     */
+    private BigDecimal refundAmount;
+
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+
+    /**
+     * 创建时间
+     */
+    private Date createDay;
+
+}

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

@@ -0,0 +1,66 @@
+package com.czg.order.entity;
+
+import com.mybatisflex.annotation.Id;
+import com.mybatisflex.annotation.KeyType;
+import com.mybatisflex.annotation.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.sql.Date;
+
+import java.io.Serial;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 台桌订单统计表 实体类。
+ *
+ * @author zs
+ * @since 2025-03-07
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@Table("tb_shop_table_order_statistic")
+public class ShopTableOrderStatistic implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @Id(keyType = KeyType.Auto)
+    private Long id;
+
+    private Long tableId;
+
+    /**
+     * 订单数量
+     */
+    private Long orderCount;
+
+    /**
+     * 订单金额
+     */
+    private BigDecimal orderAmount;
+
+    /**
+     * 店铺id
+     */
+    private Long shopId;
+
+    /**
+     * 创建日期 年月日
+     */
+    private Date createDay;
+    /**
+     * 退款数量
+     */
+    private long refundCount;
+    /**
+     * 退款金额
+     */
+    private BigDecimal refundAmount;
+}
+

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

@@ -1,5 +1,6 @@
 package com.czg.order.service;
 
+import com.czg.order.vo.OrderDetailPrintVo;
 import com.mybatisflex.core.service.IService;
 import com.czg.order.entity.OrderDetail;
 
@@ -14,5 +15,5 @@ import java.util.List;
 public interface OrderDetailService extends IService<OrderDetail> {
 
     void createOrderDetails(Long orderId, List<OrderDetail> orderDetails);
-
+    List<OrderDetailPrintVo> getOrderDetailPrint(Long orderId);
 }

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

@@ -5,6 +5,7 @@ import com.czg.order.dto.*;
 import com.czg.order.entity.OrderDetail;
 import com.czg.order.entity.OrderInfo;
 import com.czg.order.enums.PayEnums;
+import com.czg.order.vo.HistoryOrderPrintVo;
 import com.czg.order.vo.HistoryOrderVo;
 import com.czg.order.vo.OrderInfoVo;
 import com.czg.resp.CzgResult;
@@ -29,6 +30,7 @@ public interface OrderInfoService extends IService<OrderInfo> {
     Page<OrderInfoVo> getOrderByPage(OrderInfoQueryDTO param);
 
     CzgResult<HistoryOrderVo> getOrderDetails(Long orderId);
+    CzgResult<HistoryOrderPrintVo> getOrderByIdPrint(Long orderId);
 
     HistoryOrderVo historyOrder(Long orderId, String tableCode);
 

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

@@ -0,0 +1,16 @@
+package com.czg.order.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.order.entity.ShopOrderStatistic;
+
+/**
+ *  服务层。
+ *
+ * @author zs
+ * @since 2025-03-07
+ */
+public interface ShopOrderStatisticService extends IService<ShopOrderStatistic> {
+
+    void statistic();
+
+}

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

@@ -0,0 +1,16 @@
+package com.czg.order.service;
+
+import com.mybatisflex.core.service.IService;
+import com.czg.order.entity.ShopProdStatistic;
+
+/**
+ *  服务层。
+ *
+ * @author zs
+ * @since 2025-03-07
+ */
+public interface ShopProdStatisticService extends IService<ShopProdStatistic> {
+
+    void statistic();
+
+}

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

@@ -1,8 +1,8 @@
-package com.czg.account.service;
+package com.czg.order.service;
 
 import com.mybatisflex.core.paginate.Page;
 import com.mybatisflex.core.service.IService;
-import com.czg.account.entity.ShopTableOrderStatistic;
+import com.czg.order.entity.ShopTableOrderStatistic;
 
 import java.math.BigDecimal;
 
@@ -10,10 +10,9 @@ import java.math.BigDecimal;
  * 台桌订单统计表 服务层。
  *
  * @author zs
- * @since 2025-03-03
+ * @since 2025-03-07
  */
 public interface ShopTableOrderStatisticService extends IService<ShopTableOrderStatistic> {
-
     Page<ShopTableOrderStatistic> summary(Long shopId, String startTime, String endTime);
 
     /**
@@ -25,4 +24,6 @@ public interface ShopTableOrderStatisticService extends IService<ShopTableOrderS
      * @return 是否成功
      */
     boolean addInfo(long shopId, long tableId, long count, BigDecimal amount);
+
+    void statistic();
 }

cash-common/cash-common-service/src/main/java/com/czg/order/vo/HistoryOrderPrintVo.java

@@ -0,0 +1,18 @@
+package com.czg.order.vo;
+
+import com.czg.order.entity.OrderInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ww
+ * @description
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class HistoryOrderPrintVo extends OrderInfo {
+    private Map<String, List<OrderDetailPrintVo>> detailMap;
+}

cash-common/cash-common-service/src/main/java/com/czg/order/vo/OrderDetailPrintVo.java

@@ -0,0 +1,23 @@
+package com.czg.order.vo;
+
+import com.czg.order.entity.OrderDetail;
+import lombok.*;
+
+import java.io.Serial;
+import java.io.Serializable;
+
+/**
+ * 订单详情 实体类。
+ *
+ * @author ww
+ * @since 2025-02-14
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OrderDetailPrintVo extends OrderDetail implements Serializable{
+
+
+    private Long categoryId;
+}