caifc 4 vuotta sitten
vanhempi
commit
0121307a95

+ 1 - 1
blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/entity/Order.java

@@ -392,7 +392,7 @@ public class Order implements Serializable {
 	 * 到港日期
 	 */
 		@ApiModelProperty(value = "到港日期")
-		private LocalDateTime dateOfArrival;
+		private Date dateOfArrival;
 	/**
 	 * 是否到货
 	 */

+ 21 - 0
blade-service-api/trade-purchase-api/src/main/java/com/trade/purchase/order/entity/Order.java

@@ -7,6 +7,7 @@ import lombok.Data;
 
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 
 /**
@@ -128,6 +129,26 @@ public class Order implements Serializable {
 	@ApiModelProperty(value = "要求到货日期")
 	private Date requiredArrivalDate;
 	/**
+	 * 到港日期
+	 */
+	@ApiModelProperty(value = "到港日期")
+	private Date dateOfArrival;
+	/**
+	 * 是否到货
+	 */
+	@ApiModelProperty(value = "是否到货")
+	private Integer arrival;
+	/**
+	 * 首付比列
+	 */
+	@ApiModelProperty(value = "首付比列")
+	private BigDecimal downPayment;
+	/**
+	 * 人民币金额
+	 */
+	@ApiModelProperty(value = "人民币金额")
+	private BigDecimal rmbAmount;
+	/**
 	 * 订单备注
 	 */
 	@ApiModelProperty(value = "订单备注")

+ 4 - 0
blade-service/trade-purchase/src/main/java/com/trade/purchase/order/mapper/OrderMapper.xml

@@ -72,6 +72,10 @@
         <result column="update_time" property="updateTime"/>
         <result column="status" property="status"/>
         <result column="is_deleted" property="isDeleted"/>
+        <result column="date_of_arrival" property="dateOfArrival"/>
+        <result column="arrival" property="arrival"/>
+        <result column="down_payment" property="downPayment"/>
+        <result column="rmb_amount" property="rmbAmount"/>
     </resultMap>