From e20c58a63d3827d9c55cd5f387568fb0916b9590 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期五, 17 三月 2023 23:37:12 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-common/src/main/java/com/java110/common/cmd/chargeMachine/StopChargeCmd.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/StopChargeCmd.java b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/StopChargeCmd.java
index 8517775..d821744 100644
--- a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/StopChargeCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/StopChargeCmd.java
@@ -61,7 +61,6 @@
Assert.hasKeyAndValue(reqJson, "communityId", "鏈寘鍚皬鍖轰俊鎭�");
Assert.hasKeyAndValue(reqJson, "machineId", "鏈寘鍚厖鐢垫々");
Assert.hasKeyAndValue(reqJson, "portId", "鏈寘鍚彃妲�");
- Assert.hasKeyAndValue(reqJson, "orderId", "鏈寘鍚鍗曞彿");
String userId = context.getReqHeaders().get("user-id");
Assert.hasLength(userId, "鐢ㄦ埛涓嶅瓨鍦�");
@@ -98,7 +97,6 @@
chargeMachinePortDto.setPortId(reqJson.getString("portId"));
List<ChargeMachinePortDto> chargeMachinePortDtos = chargeMachinePortV1InnerServiceSMOImpl.queryChargeMachinePorts(chargeMachinePortDto);
- String orderId = reqJson.getString("orderId");
//璋冪敤鍏呯數妗╁厖鐢�
ResultVo resultVo = chargeCoreImpl.stopCharge(chargeMachineDtos.get(0), chargeMachinePortDtos.get(0));
@@ -107,13 +105,13 @@
return;
}
- // todo 鐢熸垚 鍏呯數璁㈠崟
- ChargeMachineOrderPo chargeMachineOrderPo = new ChargeMachineOrderPo();
- chargeMachineOrderPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- chargeMachineOrderPo.setState(ChargeMachineOrderDto.STATE_FINISH);
- chargeMachineOrderPo.setCommunityId(chargeMachineDtos.get(0).getCommunityId());
- chargeMachineOrderPo.setOrderId(orderId);
- chargeMachineOrderV1InnerServiceSMOImpl.updateChargeMachineOrder(chargeMachineOrderPo);
+// // todo 鐢熸垚 鍏呯數璁㈠崟
+// ChargeMachineOrderPo chargeMachineOrderPo = new ChargeMachineOrderPo();
+// chargeMachineOrderPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+// chargeMachineOrderPo.setState(ChargeMachineOrderDto.STATE_FINISH);
+// chargeMachineOrderPo.setCommunityId(chargeMachineDtos.get(0).getCommunityId());
+// chargeMachineOrderPo.setOrderId(orderId);
+// chargeMachineOrderV1InnerServiceSMOImpl.updateChargeMachineOrder(chargeMachineOrderPo);
ChargeMachinePortPo chargeMachinePortPo = new ChargeMachinePortPo();
chargeMachinePortPo.setPortId(reqJson.getString("portId"));
--
Gitblit v1.8.0