From a03469caafb8695da89e0f160be465dd49bb0fa3 Mon Sep 17 00:00:00 2001 From: zhibing.pu <393733352@qq.com> Date: 星期三, 04 九月 2024 14:33:30 +0800 Subject: [PATCH] 完善功能 --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java index 9351b4e..035fa15 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/model/TChargingOrder.java +++ b/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") @@ -109,6 +122,14 @@ @ApiModelProperty(value = "充值支付第三方流水号") @TableField("recharge_serial_number") private String rechargeSerialNumber; + + @ApiModelProperty(value = "充电金额(传给硬件方的金额)") + @TableField("charge_amount") + private BigDecimal chargeAmount; + + @ApiModelProperty(value = "剩余金额(用于前端展示)") + @TableField("residual_amount") + private BigDecimal residualAmount; @ApiModelProperty(value = "订单金额(总金额)") @TableField("order_amount") -- Gitblit v1.7.1