diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingBillInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingBillInfo.java
index 1abe422d7..627367973 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingBillInfo.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingBillInfo.java
@@ -6,8 +6,8 @@ import java.math.BigDecimal;
import java.util.Date;
/**
- * 清分账单表
- */
+ * 清分账单表
+ */
@Getter
@Setter
@Builder
@@ -15,87 +15,92 @@ import java.util.Date;
@NoArgsConstructor
public class ClearingBillInfo {
/**
- * 主键
- */
+ * 主键
+ */
private Integer id;
/**
- * 账单状态(0-未清分;1-清分在途;2-可提现;3-提现申请中;4-已提现;5等待处理;6-线下结算)
- */
+ * 账单状态(0-未清分;1-清分在途;2-可提现;3-提现申请中;4-已提现;5等待处理;6-线下结算)
+ */
private String billStatus;
/**
- * 清分账单编号
- */
+ * 账单交易日期
+ */
+ private String tradeDate;
+
+ /**
+ * 清分账单编号
+ */
private String clearingBillCode;
/**
- * 清分时间
- */
+ * 清分时间
+ */
private Date clearingTime;
/**
- * 运营商id
- */
+ * 运营商id
+ */
private String merchantId;
/**
- * 订单来源(1-万车充平台)
- */
+ * 订单来源(1-有电充平台)
+ */
private String orderSource;
/**
- * 应收金额
- */
+ * 应收金额
+ */
private BigDecimal receivableAmount;
/**
- * 应清分金额
- */
+ * 应清分金额
+ */
private BigDecimal shouldClearingAmount;
/**
- * 实际清分金额
- */
+ * 实际清分金额
+ */
private BigDecimal actualClearingAmount;
/**
- * 手续费
- */
+ * 手续费
+ */
private BigDecimal feeAmount;
/**
- * 可提现金额
- */
+ * 可提现金额
+ */
private BigDecimal withdrawableAmount;
/**
- * 提现单号
- */
+ * 提现单号
+ */
private String withdrawCode;
/**
- * 创建人
- */
+ * 创建人
+ */
private String createBy;
/**
- * 创建时间
- */
+ * 创建时间
+ */
private Date createTime;
/**
- * 更新人
- */
+ * 更新人
+ */
private String updateBy;
/**
- * 更新时间
- */
+ * 更新时间
+ */
private Date updateTime;
/**
- * 删除标识(0-正常;1-删除)
- */
+ * 删除标识(0-正常;1-删除)
+ */
private String delFlag;
}
\ No newline at end of file
diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingBillInfoMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingBillInfoMapper.java
index 70d480f81..ceacec818 100644
--- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingBillInfoMapper.java
+++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingBillInfoMapper.java
@@ -8,6 +8,7 @@ import java.util.List;
public interface ClearingBillInfoMapper {
/**
* delete by primary key
+ *
* @param id primaryKey
* @return deleteCount
*/
@@ -15,6 +16,7 @@ public interface ClearingBillInfoMapper {
/**
* insert record to table
+ *
* @param record the record
* @return insert count
*/
@@ -22,6 +24,7 @@ public interface ClearingBillInfoMapper {
/**
* insert record to table selective
+ *
* @param record the record
* @return insert count
*/
@@ -29,6 +32,7 @@ public interface ClearingBillInfoMapper {
/**
* select by primary key
+ *
* @param id primary key
* @return object by primary key
*/
@@ -36,6 +40,7 @@ public interface ClearingBillInfoMapper {
/**
* update record selective
+ *
* @param record the updated record
* @return update count
*/
@@ -43,6 +48,7 @@ public interface ClearingBillInfoMapper {
/**
* update record
+ *
* @param record the updated record
* @return update count
*/
diff --git a/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml
index 646969656..439664219 100644
--- a/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml
+++ b/jsowell-pile/src/main/resources/mapper/pile/ClearingBillInfoMapper.xml
@@ -6,6 +6,7 @@
+
@@ -24,8 +25,8 @@
- id, bill_status, clearing_bill_code, clearing_time, merchant_id, order_source, receivable_amount,
- should_clearing_amount, actual_clearing_amount, fee_amount, withdrawable_amount,
+ id, bill_status, trade_date, clearing_bill_code, clearing_time, merchant_id, order_source,
+ receivable_amount, should_clearing_amount, actual_clearing_amount, fee_amount, withdrawable_amount,
withdraw_code, create_by, create_time, update_by, update_time, del_flag