历史订单

订单列表

cash-common/cash-common-service/src/main/java/com/czg/account/dto/QueryReceiveDto.java

@@ -1,6 +1,7 @@
 package com.czg.account.dto;
 
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -11,9 +12,9 @@ import java.time.LocalDateTime;
  */
 @Data
 public class QueryReceiveDto {
-    @NotBlank(message = "优惠券id 不可为空")
+    @NotNull(message = "优惠券id 不可为空")
     private Long couponId;
-    @NotBlank(message = "店铺Id 不可为空")
+    @NotNull(message = "店铺Id 不可为空")
     private Long shopId;
     //用户昵称 手机号 模糊
     private String value;

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

@@ -12,7 +12,7 @@ import java.util.Map;
  * @description
  */
 @Data
-public class HistoryOrderVo {
-    private OrderInfo info;
+public class HistoryOrderVo extends OrderInfo {
+//    private OrderInfo info;
     private Map<Integer, List<OrderDetail>> detailMap;
 }

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

@@ -30,7 +30,11 @@ public class OrderDetailSmallVO implements Serializable {
     private String skuName;
     private BigDecimal num;
     private BigDecimal packNum;
+    private BigDecimal returnNum;
     private BigDecimal refundNum;
+    private BigDecimal price;
+    private BigDecimal payAmount;
+    private String remark;
 
 }