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/charge/ChargeCoreImpl.java | 90 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 73 insertions(+), 17 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 b6b4a8e..28608b2 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
@@ -97,6 +97,7 @@
return resultVo;
}
+
//璁㈠崟閫�娆�
returnOrderMoney(chargeMachineDto, chargeMachinePortDto, "鐢ㄦ埛鎵嬪伐缁撴潫");
@@ -122,15 +123,6 @@
return;
}
- ChargeMachineOrderPo chargeMachineOrderPo = new ChargeMachineOrderPo();
- chargeMachineOrderPo.setOrderId(chargeMachineOrderDtos.get(0).getOrderId());
- chargeMachineOrderPo.setRemark(remark);
- chargeMachineOrderPo.setState(ChargeMachineOrderDto.STATE_FINISH);
- chargeMachineOrderPo.setCommunityId(chargeMachineOrderDtos.get(0).getCommunityId());
- int flag = chargeMachineOrderV1InnerServiceSMOImpl.updateChargeMachineOrder(chargeMachineOrderPo);
- if (flag < 1) {
- throw new IllegalArgumentException("淇敼璁㈠崟澶辫触");
- }
String chargeHours = chargeMachineOrderDtos.get(0).getChargeHours();
double cHours = Double.parseDouble(chargeHours);
if (999 == cHours) {
@@ -145,6 +137,21 @@
double returnMoney = freeHours.multiply(new BigDecimal(Double.parseDouble(chargeMachineDto.getDurationPrice()))).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
+
+ ChargeMachineOrderPo chargeMachineOrderPo = new ChargeMachineOrderPo();
+ chargeMachineOrderPo.setOrderId(chargeMachineOrderDtos.get(0).getOrderId());
+ chargeMachineOrderPo.setRemark(remark);
+ chargeMachineOrderPo.setState(ChargeMachineOrderDto.STATE_FINISH);
+ BigDecimal amount = new BigDecimal(Double.parseDouble(chargeMachineOrderDtos.get(0).getAmount())).subtract(new BigDecimal(returnMoney)).setScale(2, BigDecimal.ROUND_HALF_UP);
+ chargeMachineOrderPo.setAmount(amount.doubleValue() + "");
+ chargeMachineOrderPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ chargeMachineOrderPo.setCommunityId(chargeMachineOrderDtos.get(0).getCommunityId());
+ int flag = chargeMachineOrderV1InnerServiceSMOImpl.updateChargeMachineOrder(chargeMachineOrderPo);
+ if (flag < 1) {
+ throw new IllegalArgumentException("淇敼璁㈠崟澶辫触");
+ }
+
+
AccountDto accountDto = new AccountDto();
accountDto.setAcctId(chargeMachineOrderDtos.get(0).getAcctDetailId());
List<AccountDto> accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
@@ -156,6 +163,24 @@
accountDetailPo.setAmount(returnMoney + "");
accountDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
accountInnerServiceSMOImpl.prestoreAccount(accountDetailPo);
+
+ //鍏呯數琛ㄤ腑鍔犲叆閫�娆鹃噾棰�
+
+ ChargeMachineOrderAcctPo chargeMachineOrderAcctPo = new ChargeMachineOrderAcctPo();
+ chargeMachineOrderAcctPo.setAcctDetailId(accountDetailPo.getDetailId());
+ chargeMachineOrderAcctPo.setAmount((-1 * returnMoney) + "");
+
+ chargeMachineOrderAcctPo.setCmoaId(GenerateCodeFactory.getGeneratorId("11"));
+ chargeMachineOrderAcctPo.setOrderId(chargeMachineOrderDtos.get(0).getOrderId());
+ chargeMachineOrderAcctPo.setAcctId(accountDtos.get(0).getAcctId());
+ chargeMachineOrderAcctPo.setStartTime(chargeMachineOrderDtos.get(0).getStartTime());
+
+ chargeMachineOrderAcctPo.setEndTime(chargeMachineOrderDtos.get(0).getEndTime());
+ chargeMachineOrderAcctPo.setRemark("璐︽埛閫�娆�-" + remark);
+ chargeMachineOrderAcctPo.setCommunityId(chargeMachineOrderDtos.get(0).getCommunityId());
+ chargeMachineOrderAcctPo.setEnergy("0");
+
+ chargeMachineOrderAcctV1InnerServiceSMOImpl.saveChargeMachineOrderAcct(chargeMachineOrderAcctPo);
}
@Override
@@ -183,18 +208,22 @@
@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);
+// // 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, "鍏呯數妗� 涓嶅瓨鍦�");
+ //Assert.listOnlyOne(chargeMachineDtos, "鍏呯數妗� 涓嶅瓨鍦�");
+
+ if(chargeMachineDtos == null || chargeMachineDtos.size() < 1){
+ return new ResultVo(ResultVo.CODE_OK, "鎴愬姛");
+ }
// todo 鎻掓Ы鏄惁绌洪棽
@@ -203,7 +232,10 @@
chargeMachinePortDto.setPortCode(notifyChargeOrderDto.getPortCode());
chargeMachinePortDto.setState(ChargeMachinePortDto.STATE_WORKING);
List<ChargeMachinePortDto> chargeMachinePortDtos = chargeMachinePortV1InnerServiceSMOImpl.queryChargeMachinePorts(chargeMachinePortDto);
- Assert.listOnlyOne(chargeMachinePortDtos, "鎻掓Ы蹇欑嚎");
+ //Assert.listOnlyOne(chargeMachinePortDtos, "鎻掓Ы绌洪棽");
+ if(chargeMachinePortDtos == null || chargeMachinePortDtos.size() < 1){
+ return new ResultVo(ResultVo.CODE_OK, "鎴愬姛");
+ }
ChargeMachinePortPo chargeMachinePortPo = new ChargeMachinePortPo();
chargeMachinePortPo.setPortId(chargeMachinePortDtos.get(0).getPortId());
@@ -222,4 +254,28 @@
"\"msg\" : \"success\"\n" +
"}", HttpStatus.OK);
}
+
+ @Override
+ public void queryChargeMachineState(List<ChargeMachineDto> chargeMachineDtos) {
+
+ for(ChargeMachineDto chargeMachineDto : chargeMachineDtos) {
+ try {
+ ChargeMachineFactoryDto chargeMachineFactoryDto = new ChargeMachineFactoryDto();
+ chargeMachineFactoryDto.setFactoryId(chargeMachineDto.getImplBean());
+ List<ChargeMachineFactoryDto> chargeMachineFactoryDtos = chargeMachineFactoryV1InnerServiceSMOImpl.queryChargeMachineFactorys(chargeMachineFactoryDto);
+
+ Assert.listOnlyOne(chargeMachineFactoryDtos, "鍏呯數妗╁巶瀹朵笉瀛樺湪");
+
+ IChargeFactoryAdapt chargeFactoryAdapt = ApplicationContextFactory.getBean(chargeMachineFactoryDtos.get(0).getBeanImpl(), IChargeFactoryAdapt.class);
+ if (chargeFactoryAdapt == null) {
+ throw new CmdException("鍘傚鎺ュ彛鏈疄鐜�");
+ }
+ chargeFactoryAdapt.queryChargeMachineState(chargeMachineDto);
+ }catch (Exception e){
+ e.printStackTrace();
+ chargeMachineDto.setState(ChargeMachineDto.STATE_OFFLINE);
+ chargeMachineDto.setStateName("绂荤嚎");
+ }
+ }
+ }
}
--
Gitblit v1.8.0