代码提交

无关风月

2024-08-30 2adb12e9b91ce42a044e12ed4303b327f7e6ffd6

代码提交

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

@@ -64,5 +64,25 @@
    @TableField("charging_capacity")
    private BigDecimal chargingCapacity;

    @ApiModelProperty(value = "时段电费")
    @TableField("period_electric_price")
    private BigDecimal periodElectricPrice;

    @ApiModelProperty(value = "时段服务费")
    @TableField("period_service_price")
    private BigDecimal periodServicePrice;

    @ApiModelProperty(value = "会员抵扣")
    @TableField(exist = false)
    private BigDecimal vipDiscount;

    @ApiModelProperty(value = "优惠券抵扣")
    @TableField(exist = false)
    private BigDecimal couponDiscount;

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


}

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderInfoVO.java

New file
@@ -0,0 +1,35 @@
package com.ruoyi.order.api.vo;

import com.ruoyi.order.api.model.TChargingOrder;
import com.ruoyi.order.api.model.TChargingOrderAccountingStrategy;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

@Data
@ApiModel(value = "SiteDetailEvaluateVO对象",description = "站点详情订单评价")
public class ChargingOrderInfoVO extends TChargingOrder {
    @ApiModelProperty(value = "充电电流")
    private String cdElectronic;
    @ApiModelProperty(value = "充电电压")
    private String cdVoltage;
    @ApiModelProperty(value = "剩余电量")
    private String  surplus;
    @ApiModelProperty(value = "实时总功率")
    private String totalPower;
    @ApiModelProperty(value = "车牌号")
    private String licensePlate;
    @ApiModelProperty(value = "车辆品牌")
    private String vehicleBrand;
    @ApiModelProperty(value = "车辆类型")
    private String vehicleModel;
    @ApiModelProperty(value = "用车类型")
    private String vehicleUse;

    @ApiModelProperty(value = "充电明细列表")
    private List<TChargingOrderAccountingStrategy> list;

}

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/vo/ChargingOrderVO.java

@@ -38,5 +38,4 @@
    private Integer count;
    @ApiModelProperty(value = "1明星充电 2快电 3新电途")
    private Integer orderSource;

}

 ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java

@@ -26,6 +26,7 @@
import com.ruoyi.order.api.model.*;
import com.ruoyi.order.api.query.ChargingOrderQuery;
import com.ruoyi.order.api.query.TChargingCountQuery;
import com.ruoyi.order.api.vo.ChargingOrderInfoVO;
import com.ruoyi.order.api.vo.ChargingOrderVO;
import com.ruoyi.order.api.vo.TCharingOrderVO;
import com.ruoyi.order.dto.GetMyChargingOrderList;
@@ -241,7 +242,7 @@
    @ResponseBody
    @PostMapping(value = "/chargingOrderInfo")
    @ApiOperation(value = "充电桩订单列表查看详情", tags = {"管理后台-订单管理"})
    public AjaxResult<TCharingOrderVO> chargingOrderInfo(String orderId) {
    public AjaxResult<ChargingOrderInfoVO> chargingOrderInfo(String orderId) {

        return AjaxResult.success();
    }