From eb7a808aaf7dd0a6dd2ff70f9ef3f8ce0b1e31d1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期五, 22 五月 2026 18:27:32 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/gtzxinglijicun
---
server/services/src/main/java/com/doumee/dao/dto/CalculateLocalPriceDTO.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/dto/CalculateLocalPriceDTO.java b/server/services/src/main/java/com/doumee/dao/dto/CalculateLocalPriceDTO.java
index c411602..a1b7429 100644
--- a/server/services/src/main/java/com/doumee/dao/dto/CalculateLocalPriceDTO.java
+++ b/server/services/src/main/java/com/doumee/dao/dto/CalculateLocalPriceDTO.java
@@ -8,34 +8,42 @@
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
- * 灏卞湴瀛樺彇棰勪及璐圭敤璇锋眰DTO
+ * 灏卞湴瀵勫瓨棰勪及璐圭敤璇锋眰DTO
*
* @Author : Rk
* @create 2026/4/14
*/
@Data
-@ApiModel("灏卞湴瀛樺彇棰勪及璐圭敤璇锋眰")
+@ApiModel("灏卞湴瀵勫瓨棰勪及璐圭敤璇锋眰")
public class CalculateLocalPriceDTO {
@ApiModelProperty(value = "鍩庡競涓婚敭", required = true)
@NotNull(message = "鍩庡競涓嶈兘涓虹┖")
private Integer cityId;
- @ApiModelProperty(value = "棰勮瀛樻斁澶╂暟", required = true)
- @NotNull(message = "棰勮瀛樻斁澶╂暟涓嶈兘涓虹┖")
- private Integer estimatedDepositDays;
+ @ApiModelProperty(value = "棰勮瀛樻斁寮�濮嬫椂闂�", required = true)
+ @NotNull(message = "棰勮瀛樻斁寮�濮嬫椂闂翠笉鑳戒负绌�")
+ private Date depositStartTime;
+
+ @ApiModelProperty(value = "棰勮瀛樻斁缁撴潫鏃堕棿", required = true)
+ @NotNull(message = "棰勮瀛樻斁缁撴潫鏃堕棿涓嶈兘涓虹┖")
+ private Date depositEndTime;
@ApiModelProperty(value = "鐗╁搧鍒楄〃", required = true)
@NotEmpty(message = "鐗╁搧鍒楄〃涓嶈兘涓虹┖")
@Valid
private List<OrderItemDTO> items;
- @ApiModelProperty(value = "鏄惁淇濅环")
- private Boolean insured;
-
@ApiModelProperty(value = "淇濅环閲戦(鍏�)")
private BigDecimal declaredAmount;
+
+ @ApiModelProperty(value = "浼氬憳涓婚敭", hidden = true)
+ private Integer memberId;
+
+ @ApiModelProperty(value = "浼樻儬鍒镐富閿細-1=鑷姩閫夋嫨鏈�浼橈紱null=涓嶄娇鐢紱>0=鎸囧畾浼樻儬鍒窱D")
+ private Integer couponId;
}
--
Gitblit v1.9.3