数据统计

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

@@ -141,11 +141,11 @@ public class ShopOrderStatistic implements Serializable {
      * 创建时间
      */
     @JSONField(format = "yyyy-MM-dd")
-    private LocalDate createDay = LocalDate.now();
+    private LocalDate createDay;
     /**
      * 最近一次统计时间
      */
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
-    private LocalDateTime updateTime = LocalDateTime.now();
+    private LocalDateTime updateTime;
 
 }

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

@@ -1,29 +1,67 @@
 package com.czg.order.enums;
 
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author ww
  */
 
 @Getter
+@RequiredArgsConstructor
 public enum PayEnums {
-    
+
+    /**
+     * 主扫
+     */
     MAIN_SCAN("main_scan", "主扫"),
+    /**
+     * 被扫
+     */
     BACK_SCAN("back_scan", "被扫"),
+    /**
+     * 微信小程序
+     */
     WECHAT_MINI("wechat_mini", "微信小程序"),
+    /**
+     * 支付宝小程序
+     */
     ALIPAY_MINI("alipay_mini", "支付宝小程序"),
+    /**
+     * 会员支付
+     */
     VIP_PAY("vip_pay", "会员支付"),
+    /**
+     * 现金支付
+     */
     CASH_PAY("cash_pay", "现金支付"),
+    /**
+     * 挂账支付
+     */
     CREDIT_PAY("credit_pay", "挂账支付"),
-    H5_PAY("h5_pay", "h5支付");
+    /**
+     * h5支付
+     */
+    H5_PAY("h5_pay", "H5支付");
 
 
     private final String value;
     private final String msg;
 
-    PayEnums(String value, String msg) {
-        this.value = value;
-        this.msg = msg;
+
+    public static List<String> getValues() {
+        return Arrays.stream(values()).map(PayEnums::getValue).toList();
     }
+
+    public static String getText(String value) {
+        PayEnums item = Arrays.stream(values()).filter(obj -> value.equals(obj.getValue())).findFirst().orElse(null);
+        if (item != null) {
+            return item.getMsg();
+        }
+        return "未知支付方式";
+    }
+
 }

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

@@ -1,6 +1,8 @@
 package com.czg.order.param;
 
 import com.alibaba.fastjson2.annotation.JSONField;
+import com.czg.validator.group.DefaultGroup;
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
 
 import java.io.Serial;
@@ -21,10 +23,12 @@ public class DataSummaryTradeParam implements Serializable {
     /**
      * 开始时间 格式：yyyy-MM-dd
      */
+    @NotBlank(message = "开始日期不能为空", groups = DefaultGroup.class)
     private String beginTime;
     /**
      * 结束时间 格式：yyyy-MM-dd
      */
+    @NotBlank(message = "结束日期不能为空", groups = DefaultGroup.class)
     private String endTime;
     /**
      * 店铺id

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

@@ -5,6 +5,7 @@ import lombok.NoArgsConstructor;
 
 import java.io.Serial;
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -34,15 +35,15 @@ public class DataSummaryDateAmountVo implements Serializable {
         /**
          * 实收金额
          */
-        private Integer actualAmount;
+        private BigDecimal actualAmount = BigDecimal.ZERO;
         /**
          * 优惠金额
          */
-        private Integer discountAmount;
+        private BigDecimal discountAmount = BigDecimal.ZERO;
         /**
          * 订单金额
          */
-        private Integer orderAmount;
+        private BigDecimal orderAmount = BigDecimal.ZERO;
         /**
          * 日期
          */