|
@@ -3,12 +3,15 @@ package com.yh.saas.plugin.yiliangyiyun.entity;
|
|
|
import com.baomidou.mybatisplus.annotations.TableId;
|
|
|
import com.baomidou.mybatisplus.annotations.TableName;
|
|
|
import com.baomidou.mybatisplus.enums.IdType;
|
|
|
+import com.fasterxml.jackson.annotation.JsonFormat;
|
|
|
import com.yh.saas.common.support.entity.BaseModel;
|
|
|
import lombok.Data;
|
|
|
import lombok.EqualsAndHashCode;
|
|
|
import lombok.experimental.Accessors;
|
|
|
+import org.springframework.format.annotation.DateTimeFormat;
|
|
|
|
|
|
import java.io.Serializable;
|
|
|
+import java.util.Date;
|
|
|
|
|
|
/**
|
|
|
* <p>
|
|
@@ -51,7 +54,42 @@ public class FreightInfo extends BaseModel<FreightInfo> {
|
|
|
* 明细
|
|
|
*/
|
|
|
private String detailed;
|
|
|
-
|
|
|
+ /**
|
|
|
+ * 应还运费
|
|
|
+ */
|
|
|
+ private Float freightPayable;
|
|
|
+ /**
|
|
|
+ * 超期费
|
|
|
+ */
|
|
|
+ private Float overdueFee;
|
|
|
+ /**
|
|
|
+ * 平台确认还款金额
|
|
|
+ */
|
|
|
+ private Float repaymentConfirm;
|
|
|
+ /**
|
|
|
+ * 预付运费时间
|
|
|
+ */
|
|
|
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
|
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
|
+ private Date prepaidFreightDate;
|
|
|
+ /**
|
|
|
+ * 运费尾款支付时间
|
|
|
+ */
|
|
|
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
|
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
|
|
+ private Date freightBalanceDate;
|
|
|
+ /**
|
|
|
+ * 扣款
|
|
|
+ */
|
|
|
+ private Float deduction;
|
|
|
+ /**
|
|
|
+ * 服务费
|
|
|
+ */
|
|
|
+ private Float serviceCharge;
|
|
|
+ /**
|
|
|
+ * 超期利率
|
|
|
+ */
|
|
|
+ private Float interestRate;
|
|
|
|
|
|
@Override
|
|
|
protected Serializable pkVal() {
|