修改bug

puzhibing

4 天以前 a0e03b646f2c444b0f09687d24e9995112b99017

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/feignClient/ChargingOrderClient.java

@@ -5,6 +5,8 @@
import com.ruoyi.common.core.dto.ChargingOrderGroup;
import com.ruoyi.common.core.dto.ChargingPercentProvinceDto;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.order.api.dto.ChargingStatisticeDTO;
import com.ruoyi.order.api.dto.DeviceStartChargingDTO;
import com.ruoyi.order.api.factory.ChargingOrderFallbackFactory;
import com.ruoyi.order.api.model.AddTripartitePlatformOrder;
import com.ruoyi.order.api.model.ChargingListQuery;
@@ -19,6 +21,7 @@
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;

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

/**
@@ -96,6 +99,13 @@
     */
    @PostMapping(value = "/t-charging-order/getOrderByCode/{code}")
    R<TChargingOrder> getOrderByCode(@PathVariable("code") String code);

    /**
     * 根据订单编号前缀将握手 VIN 写入对应订单表
     */
    @PostMapping(value = "/t-charging-order/updateHandshakeVin")
    R<Boolean> updateHandshakeVin(@RequestParam("orderCode") String orderCode,
                                  @RequestParam("vin") String vin);
    
    
    /**
@@ -172,7 +182,18 @@
    void chargingOrderALICallback(@RequestParam("out_trade_no") String out_trade_no,
                                  @RequestParam("transaction_id") String transaction_id,
                                  @RequestParam("attach") String attach);
    

    /**
     * 充电支付成功回调通知
     * @param out_trade_no
     * @param transaction_id
     * @param attach
     */
    @PostMapping("/t-charging-order/chargingOrderALIH5Callback")
    void chargingOrderALIH5Callback(@RequestParam("out_trade_no") String out_trade_no,
                                  @RequestParam("transaction_id") String transaction_id,
                                  @RequestParam("attach") String attach);

    /**
     * 远程启动失败后退款回调
     * @param out_refund_no
@@ -226,7 +247,7 @@
     * @param vo
     */
    @PostMapping("/t-charging-order/endChargeBillingCharge")
    void endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
    R endChargeBillingCharge(@RequestBody TransactionRecordMessageVO vo);
    
    /**
     * 获取充电订单数据
@@ -235,8 +256,15 @@
     */
    @PostMapping("/t-charging-order/getChargingOrder")
    R<List<TChargingOrder>> getChargingOrder(@RequestBody TChargingOrderVo order);
    
    
    /**
     * 获取充电订单数据
     * @param
     * @return
     */
    @PostMapping(value = "/t-charging-order/getChargingStatistics")
    public R<List<TChargingOrder>> getChargingStatistics(@RequestBody ChargingStatisticeDTO dto);


    /**
     * 根据车辆id获取指定时间范围内的数据
     * @param carId
@@ -247,6 +275,19 @@
    @PostMapping("/t-charging-order/getCarChargingOrder")
    R<List<TChargingOrder>> getCarChargingOrder(@RequestParam("carId") Long carId, @RequestParam("startTime") String startTime,
                                                @RequestParam("endTime") String endTime);
    
    
    /**
     * 根据车牌号查询指定时间范围内的数据
     * @param plateNum
     * @param startTime
     * @param endTime
     * @return
     */
    @PostMapping("/t-charging-order/getCarChargingOrderByPlateNum")
    R<List<TChargingOrder>> getCarChargingOrderByPlateNum(@RequestParam("plateNum") String plateNum, @RequestParam("startTime") String startTime,
                                                @RequestParam("endTime") String endTime);
    
    
    
    
@@ -267,6 +308,18 @@
    R<TChargingOrder> getChargingOrderByStartChargeSeq(@RequestParam("startChargeSeq") String startChargeSeq);
    
    
    
    /**
     * 根据三方平台订单ids获取充电数据
     * @param startChargeSeqs
     * @return
     */
    @PostMapping("/t-charging-order/getChargingOrderByStartChargeSeqs")
    R<List<TChargingOrder>> getChargingOrderByStartChargeSeqs(@RequestParam("startChargeSeqs") List<String> startChargeSeqs);
    
    
    
    
    /**
     * 三方平台请求停止充电
     * @param startChargeSeq
@@ -274,4 +327,60 @@
     */
    @PostMapping("/t-charging-order/tripartitePlatformStopCharge")
    R tripartitePlatformStopCharge(@RequestParam("startChargeSeq") String startChargeSeq);

    /**
     * 充电桩大屏 获取站点集合中总的充电量
     */
    @GetMapping("/t-charging-order/getSumDegreeBySiteIds")
    R<BigDecimal> getSumDegreeBySiteIds(@RequestParam("siteIds") List<Integer> SiteIds);

    /**
     * 充电桩大屏 获取站点集合中累计充电量(已结束+已支付订单口径, 与 large-screen/summary 一致)
     */
    @GetMapping("/t-charging-order/getLargeScreenTotalCapacity")
    R<BigDecimal> getLargeScreenTotalCapacity(@RequestParam("siteIds") List<Integer> siteIds);

    /**
     * 查询指定站点中实际发生过充电的用户ID
     */
    @PostMapping("/t-charging-order/getAppUserIdsBySiteIds")
    R<List<Long>> getAppUserIdsBySiteIds(@RequestBody List<Integer> siteIds);

    @PostMapping("/t-vin-charging-order/inner/charging-status")
    R<List<VinChargingStatusVO>> getChargingVinStatus(@RequestBody List<Long> vinIds);


//    /**
//     * 获取充电订单列表
//     * @param statusList
//     * @return
//     */
//    @GetMapping("/t-charging-order/getOrderListByStatus")
//    R<List<TChargingOrder>> getOrderListByStatus(List<Integer> statusList);

    /**
     * 添加订单
     * @param chargingOrder
     * @return
     */
    @PostMapping("/t-charging-order/addChargingOrder")
    R<Long> addChargingOrder(@RequestBody TChargingOrder chargingOrder);

    /**
     * 设备主动发起充电（刷卡/VIN码）鉴权建单
     * @param dto 启动鉴权请求（桩编码、枪编号、启动方式、账户、卡密码）
     * @return 鉴权结果（含订单编号与失败原因）
     */
    @PostMapping("/t-charging-order/inner/device-start-charging")
    R<DeviceStartChargingVO> deviceStartCharging(@RequestBody DeviceStartChargingDTO dto);

    /**
     * 统计公司名下进行中的充电订单数（三表合计，状态 2=启动中/3=充电中/4=停止中，
     * 账户模式切换：分配→共享 前校验使用）
     *
     * @param companyId 所属公司ID
     * @return 进行中订单数
     */
    @PostMapping("/t-charging-order/inner/count-active-by-company")
    R<Integer> countActiveByCompany(@RequestParam("companyId") Integer companyId);
}