From 792cbb986fb8c32f6bbc1638c4ae264372e7a28f Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期四, 23 一月 2025 19:31:36 +0800 Subject: [PATCH] 新增引流接口及业务逻辑 --- ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 107 insertions(+), 4 deletions(-) diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java index 61aad66..175381f 100644 --- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java +++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/TChargingOrderService.java @@ -17,6 +17,7 @@ import com.ruoyi.order.api.vo.*; import com.ruoyi.order.dto.*; import com.ruoyi.order.vo.ChargingOrderListInfoVO; +import com.ruoyi.order.vo.EndOfChargePageInfo; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; @@ -80,6 +81,20 @@ /** + * 安全检测数据 + * @param securityDetection + */ + void securityDetection(SecurityDetectionVO securityDetection); + + + /** + * 启动充电应发 + * @param message + */ + void startChargeSuccessfully(PlatformStartChargingReplyMessageVO message); + + + /** * 充电启动失败后的退款回调处理 * @param out_refund_no * @param refund_id @@ -105,6 +120,15 @@ * @return */ AjaxResult stopCharging(String id); + + + /** + * 停止充电应答结果处理 + * @param platformStopChargingReply + */ + void terminateSuccessfulResponse(PlatformStopChargingReplyVO platformStopChargingReply); + + TCharingOrderVO chargingOrder(ChargingOrderQuery dto); @@ -118,7 +142,7 @@ List<SixCircleDto> circle(List<Integer> siteIds,LocalDate sixBefore); - Map<String, Object> countAll(LocalDate sixBefore); + Map<String, Object> countAll(LocalDate sixBefore,List<Integer> siteIds); List<Map<String, Object>> getSumByType(List<Long> chargingOrderIds); @@ -149,7 +173,20 @@ * @param code */ void endCharge(String code, Integer endMode); - + + /** + * 停止充电返回账单后计算费用 + * @param vo + */ + void endChargeBillingCharge(TransactionRecordMessageVO vo); + +// /** +// * 停止充电返回账单后计算费用 +// * @param vo +// */ +// void endChargeBillingCharge1(TransactionRecordMessageVO vo); + + /** * 异常结束充电处理逻辑 @@ -165,9 +202,11 @@ List<Map<String, Object>> queryOrderCountAndMoneyBySiteIdDate(List<Integer> siteIds); - List<Map<String, Object>> usersDay(); + List<Map<String, Object>> usersDay(ChargingStatisticsQueryDto statisticsQueryDto); + List<Map<String, Object>> usersDay1(); List<Map<String, Object>> usersByQuery(ChargingStatisticsQueryDto statisticsQueryDto); + List<Map<String, Object>> usersByQuery1(ChargingStatisticsQueryDto statisticsQueryDto); List<Map<String, Object>> getUserTagCount(); @@ -182,7 +221,7 @@ Map<String, Object> countLocalCar(); - Long getAver(List<Integer> siteIds); + Double getAver(List<Integer> siteIds); List<Map<String, Object>> getLevelEvaluate(List<Integer> siteIds); @@ -200,4 +239,68 @@ PageInfo<TSettlementConfirm> settlementList(SettlementListQuery dto); SettlementTotalVO settlementTotal(String time); + SettlementTotalVO settlementTotalR(String time,Long userId); + + List<Map<String, Object>> countBySource(List<Integer> siteIds,ChargingStatisticsQueryDto statisticsQueryDto); + + List<Map<String, Object>> equipmentUserType1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto); + + List<Map<String, Object>> equipmentUserType2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto); + + List<Map<String, Object>> equipmentMapbroke1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto); + + List<Map<String, Object>> equipmentMapbroke2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto); + + List<Map<String, Object>> equipmentMapOut1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto); + + List<Map<String, Object>> equipmentMapOut2(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto); + + List<Map<String, Object>> needElec(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto); + + List<Map<String, Object>> getHourType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto); + + List<Map<String, Object>> getDateType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto); + + List<Map<String, Object>> getMonthType(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto); + + List<Map<String, Object>> getchargingCapacity(List<Integer> siteIds, ChargingDetailQueryDto statisticsQueryDto); + + List<Map<String, Object>> countAllUserData(); + + List<Map<String, Object>> needElec1(List<Integer> siteIds, ChargingStatisticsQueryDto statisticsQueryDto); + + + /** + * 获取充电结束页面详情 + * @param id + * @return + */ + EndOfChargePageInfo getEndOfChargePageInfo(String id); + + Long countNoTag(); + + + /** + * 获取订单数据 + * @param order + * @return + */ + List<TChargingOrder> getChargingOrder(TChargingOrderVo order); + + Long countCar(List<String> brands); + + + /** + * 添加三方平台充电订单数据 + * @param chargingGunId + */ + R addTripartitePlatformOrder(Integer chargingGunId, String operatorId, Integer rechargePaymentType, BigDecimal paymentAmount, String startChargeSeq); + + + /** + * 三方平台停止充电操作 + * @param startChargeSeq + * @return + */ + R tripartitePlatformStopCharge(@RequestParam("startChargeSeq") String startChargeSeq); } -- Gitblit v1.7.1