From 9637082376d3aabe54759d34d02b72e9a53e676c Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 29 四月 2023 05:00:07 +0800
Subject: [PATCH] 优化代码
---
service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java b/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java
index f5c3f21..b3092d6 100644
--- a/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java
+++ b/service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java
@@ -120,16 +120,7 @@
String remark,
String energy,
List<ChargeMachineOrderDto> chargeMachineOrderDtos) {
- // 閫�娆�
-// ChargeMachineOrderDto chargeMachineOrderDto = new ChargeMachineOrderDto();
-// chargeMachineOrderDto.setMachineId(chargeMachineDto.getMachineId());
-// chargeMachineOrderDto.setPortId(chargeMachinePortDto.getPortId());
-// chargeMachineOrderDto.setState(ChargeMachineOrderDto.STATE_DOING);
-// List<ChargeMachineOrderDto> chargeMachineOrderDtos = chargeMachineOrderV1InnerServiceSMOImpl.queryChargeMachineOrders(chargeMachineOrderDto);
-//
-// if (chargeMachineOrderDtos == null || chargeMachineOrderDtos.size() < 1) {
-// return;
-// }
+
Date startTime = DateUtil.getDateFromStringA(chargeMachineOrderDtos.get(0).getStartTime());
@@ -353,18 +344,10 @@
@Override
public ResultVo finishCharge(NotifyChargeOrderDto notifyChargeOrderDto) {
-// // todo 鐢熸垚 鍏呯數璁㈠崟
-// ChargeMachineOrderPo chargeMachineOrderPo = new ChargeMachineOrderPo();
-// chargeMachineOrderPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
-// chargeMachineOrderPo.setState(ChargeMachineOrderDto.STATE_FINISH);
-// chargeMachineOrderPo.setOrderId(notifyChargeOrderDto.getOrderId());
-// chargeMachineOrderV1InnerServiceSMOImpl.updateChargeMachineOrder(chargeMachineOrderPo);
ChargeMachineDto chargeMachineDto = new ChargeMachineDto();
chargeMachineDto.setMachineCode(notifyChargeOrderDto.getMachineCode());
List<ChargeMachineDto> chargeMachineDtos = chargeMachineV1InnerServiceSMOImpl.queryChargeMachines(chargeMachineDto);
-
- //Assert.listOnlyOne(chargeMachineDtos, "鍏呯數妗� 涓嶅瓨鍦�");
if (chargeMachineDtos == null || chargeMachineDtos.size() < 1) {
return new ResultVo(ResultVo.CODE_OK, "鎴愬姛");
@@ -397,6 +380,15 @@
return new ResultVo(ResultVo.CODE_OK, "鎴愬姛");
}
+ ChargeMachineOrderPo chargeMachineOrderPo = new ChargeMachineOrderPo();
+ chargeMachineOrderPo.setOrderId(chargeMachineOrderDtos.get(0).getOrderId());
+ chargeMachineOrderPo.setState(ChargeMachineOrderDto.STATE_FINISHING);
+ chargeMachineOrderPo.setCommunityId(chargeMachineOrderDtos.get(0).getCommunityId());
+ int flag = chargeMachineOrderV1InnerServiceSMOImpl.updateChargeMachineOrder(chargeMachineOrderPo);
+ if (flag < 1) {
+ throw new IllegalArgumentException("淇敼璁㈠崟澶辫触");
+ }
+
//todo 鏈堝崱鐩存帴淇敼鐘舵��
if (ifMonthCard(chargeMachineOrderDtos.get(0).getPersonTel(), chargeMachinePortDtos.get(0).getCommunityId())) {
finishMonthCardChargeOrder(notifyChargeOrderDto, chargeMachineOrderDtos);
--
Gitblit v1.8.0