diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java index 304842948..d7b35cd23 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/OrderBasicInfo.java @@ -1,9 +1,12 @@ 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; /** * 订单主表 @@ -80,6 +83,9 @@ public class OrderBasicInfo { */ private String startMode; + /** + * 第三方平台类型 + */ private String thirdPartyType; /** @@ -132,6 +138,11 @@ public class OrderBasicInfo { */ private BigDecimal settleAmount; + /** + * 应补缴金额 + */ + private BigDecimal remedialAmount; + /** * 充电开始时间 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java index 289e707d1..7bff64e63 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/programlogic/AbstractProgramLogic.java @@ -401,9 +401,6 @@ public abstract class AbstractProgramLogic implements InitializingBean { totalElectricityAmount = orderAmount.subtract(totalServiceAmount); } - // 查询会员折扣 - - // 电费总金额 orderDetail.setTotalElectricityAmount(totalElectricityAmount); // 服务费总金额 diff --git a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml index 25d4f7375..70e27b6ad 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/OrderBasicInfoMapper.xml @@ -17,6 +17,7 @@ + @@ -27,6 +28,7 @@ + @@ -46,11 +48,11 @@ id, order_code, transaction_code, order_status, member_id, station_id, merchant_id, - pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode, pay_mode, - pay_status, pay_amount, pay_time, plate_number, order_amount, virtual_amount, group_code, - discount_amount, settle_amount, charge_start_time, charge_end_time, start_type, appointment_time, - start_soc, end_soc, reason, settlement_time, refund_amount, refund_status, create_by, - create_time, update_by, update_time, del_flag + pile_sn, connector_code, pile_connector_code, logic_card, vin_code, start_mode, third_party_type, + pay_mode, pay_status, pay_amount, pay_time, plate_number, order_amount, virtual_amount, + group_code, discount_amount, settle_amount, remedial_amount, charge_start_time, charge_end_time, + start_type, appointment_time, start_soc, end_soc, reason, settlement_time, refund_amount, + refund_status, create_by, create_time, update_by, update_time, del_flag