From 23ae7ecab39ffa8cf048a1975b797a01af4b8288 Mon Sep 17 00:00:00 2001 From: Guoqs <123@jsowell.com> Date: Thu, 7 Nov 2024 15:02:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B6=E5=85=85=E8=AE=A1=E7=AE=97=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E8=80=97=E7=94=B5=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/uniapp/customer/TempController.java | 19 +++++++++++++++ .../java/com/jsowell/service/TempService.java | 23 +++++++++++++++++++ .../com/jsowell/pile/dto/QueryOrderDTO.java | 18 ++++++++++++--- 3 files changed, 57 insertions(+), 3 deletions(-) diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java index f71768001..4b23373d0 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java +++ b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/customer/TempController.java @@ -583,4 +583,23 @@ public class TempController extends BaseController { } return response; } + + /** + * 计算订单耗电量 + * dto.setStationId("657"); + * dto.setStartTime("2024-10-23 00:00:00"); + * dto.setEndTime("2024-11-07 23:59:59"); + */ + @PostMapping("/calculateOrderElectricity") + public RestApiResponse calculateOrderElectricity(@RequestBody QueryOrderDTO dto) { + RestApiResponse response; + try { + tempService.calculateOrderElectricity(dto); + response = new RestApiResponse<>(); + } catch (Exception e) { + logger.error("计算订单耗电量error", e); + response = new RestApiResponse<>(); + } + return response; + } } diff --git a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java index 326aad132..8eea09f28 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/TempService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/TempService.java @@ -22,6 +22,7 @@ import com.jsowell.pile.dto.ApplyRefundDTO; import com.jsowell.pile.dto.QueryOrderDTO; import com.jsowell.pile.dto.SettleOrderReportDTO; import com.jsowell.pile.mapper.OrderBasicInfoMapper; +import com.jsowell.pile.mapper.PileMsgRecordMapper; import com.jsowell.pile.service.*; import com.jsowell.pile.vo.web.ClearingBillVO; import com.jsowell.pile.vo.web.OrderListVO; @@ -77,6 +78,28 @@ public class TempService { @Autowired private MemberAdapayRecordService memberAdapayRecordService; + @Autowired + private PileMsgRecordMapper pileMsgRecordMapper; + + /** + * 计算订单耗电量 + * 内蒙古站点 + */ + public void calculateOrderElectricity(QueryOrderDTO dto) { + // 根据站点id查询充电桩列表 + // List pileSnList = Lists.newArrayList("88240000006708", "88240000006709", "88240000006713", "88240000006714"); + // 查询充电桩的订单列表 + List orderListVOS = orderBasicInfoService.selectOrderBasicInfoList(dto); + logger.info("查询订单列表:{}", JSON.toJSONString(orderListVOS)); + // 根据充电桩编号,查询报文 + for (OrderListVO orderVO : orderListVOS) { + String pileSn = orderVO.getPileSn(); + List pileFeedList = pileMsgRecordMapper.getPileFeedList(pileSn); + } + + // + } + /** * 手动接口执行订单分账逻辑 */ diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java index 46358592d..3b5097fc1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/dto/QueryOrderDTO.java @@ -38,7 +38,9 @@ public class QueryOrderDTO extends BaseEntity { */ private String orderCode; - // 交易流水号 + /** + * 交易流水号 + */ private String transactionCode; /** @@ -51,6 +53,9 @@ public class QueryOrderDTO extends BaseEntity { */ private String stationId; + /** + * 站点Id列表 + */ private List stationIdList; /** @@ -68,6 +73,9 @@ public class QueryOrderDTO extends BaseEntity { */ private String endTime; + /** + * 订单编号列表 + */ private List orderCodeList; /** @@ -80,9 +88,13 @@ public class QueryOrderDTO extends BaseEntity { */ private String endSettleTime; - // 会员组编号 + /** + * 会员组编号 + */ private String groupCode; - // 车辆vin编号 + /** + * 车辆vin编号 + */ private String vinCode; }