diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingBillDetail.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingBillDetail.java index 41428b3b5..3a3e0033f 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingBillDetail.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/ClearingBillDetail.java @@ -1,15 +1,13 @@ package com.jsowell.pile.domain; +import lombok.*; + +import java.math.BigDecimal; import java.util.Date; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import lombok.Setter; /** - * 清分账单详情表 - */ + * 清分账单详情表 + */ @Getter @Setter @Builder @@ -17,42 +15,62 @@ import lombok.Setter; @NoArgsConstructor public class ClearingBillDetail { /** - * 主键 - */ + * 主键 + */ private Integer id; /** - * 清分账单编号 - */ + * 清分账单编号 + */ private String clearingBillCode; /** - * 订单编号 - */ + * 订单编号 + */ private String orderCode; /** - * 创建人 - */ + * 支付id + */ + private String paymentId; + + /** + * 支付确认id + */ + private String confirmId; + + /** + * 确认金额 + */ + private BigDecimal confirmAmt; + + /** + * 支付确认手续费金额 + */ + private BigDecimal feeAmt; + + /** + * 创建人 + */ 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/ClearingBillDetailMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingBillDetailMapper.java index 90ccf15c9..19c385e0c 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingBillDetailMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ClearingBillDetailMapper.java @@ -8,6 +8,7 @@ import java.util.List; public interface ClearingBillDetailMapper { /** * delete by primary key + * * @param id primaryKey * @return deleteCount */ @@ -15,6 +16,7 @@ public interface ClearingBillDetailMapper { /** * insert record to table + * * @param record the record * @return insert count */ @@ -26,6 +28,7 @@ public interface ClearingBillDetailMapper { /** * insert record to table selective + * * @param record the record * @return insert count */ @@ -33,6 +36,7 @@ public interface ClearingBillDetailMapper { /** * select by primary key + * * @param id primary key * @return object by primary key */ @@ -40,6 +44,7 @@ public interface ClearingBillDetailMapper { /** * update record selective + * * @param record the updated record * @return update count */ @@ -47,6 +52,7 @@ public interface ClearingBillDetailMapper { /** * update record + * * @param record the updated record * @return update count */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 2fc048386..c67f6c39e 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1296,6 +1296,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { ClearingBillDetail clearingBillDetail = ClearingBillDetail.builder() .clearingBillCode(clearingBillCode) .orderCode(orderBasicInfo.getOrderCode()) + .createTime(DateUtils.getNowDate()) .delFlag(DelFlagEnum.NORMAL.getValue()) .build(); diff --git a/jsowell-pile/src/main/resources/mapper/pile/ClearingBillDetailMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ClearingBillDetailMapper.xml index d4511fc0f..ee2d8d5bd 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/ClearingBillDetailMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/ClearingBillDetailMapper.xml @@ -7,6 +7,10 @@ + + + + @@ -15,8 +19,8 @@ - id, clearing_bill_code, order_code, create_by, create_time, update_by, update_time, - del_flag + id, clearing_bill_code, order_code, payment_id, confirm_id, confirm_amt, fee_amt, + create_by, create_time, update_by, update_time, del_flag