diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderSplitRecord.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderSplitRecord.java index d3424afcd..c421f5683 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderSplitRecord.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderSplitRecord.java @@ -1,7 +1,5 @@ package com.jsowell.pile.domain; -import java.math.BigDecimal; -import java.util.Date; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -9,6 +7,9 @@ import lombok.NoArgsConstructor; import lombok.experimental.Accessors; import lombok.experimental.SuperBuilder; +import java.math.BigDecimal; +import java.util.Date; + /** * 订单分账记录表 */ @@ -39,6 +40,21 @@ public class OrderSplitRecord { */ private BigDecimal settleAmount; + /** + * 订单电费金额 + */ + private BigDecimal electricityAmount; + + /** + * 订单服务费金额 + */ + private BigDecimal serviceAmount; + + /** + * 交易日期 yyyy-MM-dd + */ + private String tradeDate; + /** * 汇付用户id */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java index d0b812712..9f0c4dfb6 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/OrderSplitRecordMapper.java @@ -1,10 +1,11 @@ package com.jsowell.pile.mapper; import com.jsowell.pile.domain.OrderSplitRecord; -import org.apache.ibatis.annotations.Param; import java.util.List; +import org.apache.ibatis.annotations.Param; + public interface OrderSplitRecordMapper { int deleteByPrimaryKey(Integer id); diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml index f06ea4a8e..3c4a37dd6 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderSplitRecordMapper.xml @@ -8,6 +8,9 @@ + + + @@ -24,9 +27,10 @@ - id, order_code, `status`, settle_amount, adapay_member_id, payment_id, payment_confirm_id, - electricity_split_ratio, electricity_split_amount, service_split_ratio, service_split_amount, - remark, create_by, create_time, update_by, update_time, del_flag + id, order_code, `status`, settle_amount, electricity_amount, service_amount, trade_date, + adapay_member_id, payment_id, payment_confirm_id, electricity_split_ratio, electricity_split_amount, + service_split_ratio, service_split_amount, remark, create_by, create_time, update_by, + update_time, del_flag