完善功能

zhibing.pu

2024-09-05 f4c9281d1b7f19fef0d8ee7cb03e166a218b33f2

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java

@@ -39,6 +39,19 @@
    @ApiModelProperty(value = "订单类型（1=充电订单（小程序），2=充电订单（刷卡））")
    @TableField("order_type")
    private Integer orderType;
    @ApiModelProperty(value = "0平台1其他")
    @TableField("order_source")
    private Integer orderSource;

    @ApiModelProperty(value = "平台或其他第三分名字")
    @TableField("source_name")
    private String sourceName;
    @ApiModelProperty(value = "手续费")
    @TableField("commission_amount")
    private BigDecimal commissionAmount;
    @ApiModelProperty(value = "分佣")
    @TableField("sharing_amount")
    private BigDecimal sharingAmount;

    @ApiModelProperty(value = "订单分类（1=线上，2=线下）")
    @TableField("order_classification")
@@ -110,6 +123,10 @@
    @TableField("recharge_serial_number")
    private String rechargeSerialNumber;
    
    @ApiModelProperty(value = "充电金额（传给硬件方的金额）")
    @TableField("charge_amount")
    private BigDecimal chargeAmount;
    
    @ApiModelProperty(value = "剩余金额（用于前端展示）")
    @TableField("residual_amount")
    private BigDecimal residualAmount;
@@ -146,6 +163,14 @@
    @TableField("refund_amount")
    private BigDecimal refundAmount;

    @ApiModelProperty(value = "累计服务费")
    @TableField("service_charge")
    private BigDecimal serviceCharge;

    @ApiModelProperty(value = "累计电费")
    @TableField("electrovalence")
    private BigDecimal electrovalence;

    @ApiModelProperty(value = "退款状态（1=退款中，2=退款成功）")
    @TableField("refund_status")
    private Integer refundStatus;
@@ -164,12 +189,5 @@
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField("pay_time")
    private LocalDateTime payTime;
    
    @ApiModelProperty(value = "累计服务费")
    @TableField("service_charge")
    private BigDecimal serviceCharge;
    
    @ApiModelProperty(value = "累计电费")
    @TableField("electrovalence")
    private BigDecimal electrovalence;

}