java/mx_charging_pile.git

			@@ -4,6 +4,7 @@
			import com.baomidou.mybatisplus.annotation.TableField;
			import com.baomidou.mybatisplus.annotation.TableId;
			import com.baomidou.mybatisplus.annotation.TableName;
			import com.fasterxml.jackson.annotation.JsonFormat;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;
			@@ -11,6 +12,7 @@

			import java.io.Serializable;
			import java.math.BigDecimal;
			import java.time.LocalDateTime;

			/**
			* <p>
			@@ -35,6 +37,10 @@
			@ApiModelProperty(value = "充电订单id")
			@TableField("charging_order_id")
			private Long chargingOrderId;

			@ApiModelProperty(value = "计费策略明细id")
			@TableField("accounting_strategy_detail_id")
			private Integer accountingStrategyDetailId;

			@ApiModelProperty(value = "阶段（1=尖阶段，2=峰阶段，3=平阶段，4=谷阶段）")
			@TableField("type")
			@@ -68,9 +74,26 @@
			@TableField("period_electric_price")
			private BigDecimal periodElectricPrice;

			@ApiModelProperty(value = "时段服务费")
			@ApiModelProperty(value = "时段服务费(最终服务费含折扣)")
			@TableField("period_service_price")
			private BigDecimal periodServicePrice;

			@ApiModelProperty(value = "时段原服务费（不含折扣）")
			@TableField("period_original_service_price")
			private BigDecimal periodOriginalServicePrice;

			@ApiModelProperty(value = "优惠券抵扣金额")
			@TableField("coupon_discount_amount")
			private BigDecimal couponDiscountAmount;

			@ApiModelProperty(value = "会员优惠金额")
			@TableField("vip_discount_amount")
			private BigDecimal vipDiscountAmount;

			@ApiModelProperty(value = "首次添加时间")
			@TableField("create_time")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private LocalDateTime createTime;

			@ApiModelProperty(value = "会员抵扣")
			@TableField(exist = false)
			@@ -80,9 +103,6 @@
			@TableField(exist = false)
			private BigDecimal couponDiscount;

			@ApiModelProperty(value = "最终服务费")
			@TableField(exist = false)
			private BigDecimal finalService;


			}