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 | 279 ++++++++++++++++++++++++++-----------------------------
1 files changed, 134 insertions(+), 145 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 a5d29d0..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
@@ -27,6 +27,7 @@
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
+import java.util.Date;
import java.util.List;
/**
@@ -53,6 +54,7 @@
@Autowired
private IChargeMachineOrderAcctV1InnerServiceSMO chargeMachineOrderAcctV1InnerServiceSMOImpl;
+
@Override
public ResultVo startCharge(ChargeMachineDto chargeMachineDto, ChargeMachinePortDto chargeMachinePortDto, String chargeType, double duration, String orderId) {
@@ -90,7 +92,95 @@
throw new CmdException("鍘傚鎺ュ彛鏈疄鐜�");
}
- return chargeFactoryAdapt.stopCharge(chargeMachineDto, chargeMachinePortDto);
+ ResultVo resultVo = chargeFactoryAdapt.stopCharge(chargeMachineDto, chargeMachinePortDto);
+ if (resultVo.getCode() != ResultVo.CODE_OK) {
+ return resultVo;
+ }
+
+
+ //璁㈠崟閫�娆�
+ returnOrderMoney(chargeMachineDto, chargeMachinePortDto, "鐢ㄦ埛鎵嬪伐缁撴潫");
+
+
+ return resultVo;
+ }
+
+ /**
+ * 璁㈠崟閫�娆�
+ *
+ * @param chargeMachineDto
+ * @param chargeMachinePortDto
+ */
+ private void returnOrderMoney(ChargeMachineDto chargeMachineDto, ChargeMachinePortDto chargeMachinePortDto, String remark) {
+ // 閫�娆�
+ 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;
+ }
+
+ String chargeHours = chargeMachineOrderDtos.get(0).getChargeHours();
+ double cHours = Double.parseDouble(chargeHours);
+ if (999 == cHours) {
+ cHours = 10;
+ }
+
+ Date startTime = DateUtil.getDateFromStringA(chargeMachineOrderDtos.get(0).getStartTime());
+
+ double usedHours = Math.ceil((DateUtil.getCurrentDate().getTime() - startTime.getTime()) / (60 * 60 * 1000.00));
+
+ BigDecimal freeHours = new BigDecimal(cHours).subtract(new BigDecimal(usedHours));
+
+ 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);
+
+ AccountDetailPo accountDetailPo = new AccountDetailPo();
+ accountDetailPo.setAcctId(accountDtos.get(0).getAcctId());
+ accountDetailPo.setObjId(accountDtos.get(0).getObjId());
+ accountDetailPo.setObjType(accountDtos.get(0).getObjType());
+ 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
@@ -109,40 +199,52 @@
return chargeFactoryAdapt.getChargePortState(chargeMachineDto, chargeMachinePortDto);
}
+ /**
+ * 瀹屾垚鍏呯數
+ *
+ * @param notifyChargeOrderDto
+ * @return
+ */
@Override
- public ResponseEntity<String> finishCharge(NotifyChargeOrderDto notifyChargeOrderDto) {
+ 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 鎻掓Ы鏄惁绌洪棽
ChargeMachinePortDto chargeMachinePortDto = new ChargeMachinePortDto();
chargeMachinePortDto.setMachineId(chargeMachineDtos.get(0).getMachineId());
chargeMachinePortDto.setPortCode(notifyChargeOrderDto.getPortCode());
- chargeMachinePortDto.setState(ChargeMachinePortDto.STATE_FREE);
+ 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());
chargeMachinePortPo.setState(ChargeMachinePortDto.STATE_FREE);
chargeMachinePortV1InnerServiceSMOImpl.updateChargeMachinePort(chargeMachinePortPo);
- return new ResponseEntity<>("{\n" +
- "\"code\" : 200,\n" +
- "\"msg\" : \"success\"\n" +
- "}", HttpStatus.OK);
+ returnOrderMoney(chargeMachineDtos.get(0), chargeMachinePortDtos.get(0), notifyChargeOrderDto.getReason());
+
+ return new ResultVo(ResultVo.CODE_OK, "鎴愬姛");
}
@Override
@@ -154,139 +256,26 @@
}
@Override
- public ResponseEntity<String> chargeHeartBeat(NotifyChargeOrderDto notifyChargeOrderDto) {
- ChargeMachineDto chargeMachineDto = new ChargeMachineDto();
- chargeMachineDto.setMachineCode(notifyChargeOrderDto.getMachineCode());
- List<ChargeMachineDto> chargeMachineDtos = chargeMachineV1InnerServiceSMOImpl.queryChargeMachines(chargeMachineDto);
+ public void queryChargeMachineState(List<ChargeMachineDto> chargeMachineDtos) {
- Assert.listOnlyOne(chargeMachineDtos, "鍏呯數妗� 涓嶅瓨鍦�");
+ for(ChargeMachineDto chargeMachineDto : chargeMachineDtos) {
+ try {
+ ChargeMachineFactoryDto chargeMachineFactoryDto = new ChargeMachineFactoryDto();
+ chargeMachineFactoryDto.setFactoryId(chargeMachineDto.getImplBean());
+ List<ChargeMachineFactoryDto> chargeMachineFactoryDtos = chargeMachineFactoryV1InnerServiceSMOImpl.queryChargeMachineFactorys(chargeMachineFactoryDto);
- ChargeMachineFactoryDto chargeMachineFactoryDto = new ChargeMachineFactoryDto();
- chargeMachineFactoryDto.setFactoryId(chargeMachineDtos.get(0).getImplBean());
- List<ChargeMachineFactoryDto> chargeMachineFactoryDtos = chargeMachineFactoryV1InnerServiceSMOImpl.queryChargeMachineFactorys(chargeMachineFactoryDto);
+ Assert.listOnlyOne(chargeMachineFactoryDtos, "鍏呯數妗╁巶瀹朵笉瀛樺湪");
- Assert.listOnlyOne(chargeMachineFactoryDtos, "鍏呯數妗╁巶瀹朵笉瀛樺湪");
-
- IChargeFactoryAdapt chargeFactoryAdapt = ApplicationContextFactory.getBean(chargeMachineFactoryDtos.get(0).getBeanImpl(), IChargeFactoryAdapt.class);
- if (chargeFactoryAdapt == null) {
- throw new CmdException("鍘傚鎺ュ彛鏈疄鐜�");
- }
-
- List<NotifyChargePortDto> portDtos = chargeFactoryAdapt.getChargeHeartBeatParam(notifyChargeOrderDto);
-
- for (NotifyChargePortDto notifyChargePortDto : portDtos) {
- doDealChargePort(notifyChargePortDto, notifyChargeOrderDto, chargeMachineDtos.get(0), chargeFactoryAdapt);
- }
-
- return new ResponseEntity<>("{\n" +
- "\"code\" : 200,\n" +
- "\"msg\" : \"success\"\n" +
- "}", HttpStatus.OK);
- }
-
- /**
- * 澶勭悊鍏呯數 鎵ｆ闂
- *
- * @param notifyChargePortDto
- * @param notifyChargeOrderDto
- */
- private void doDealChargePort(NotifyChargePortDto notifyChargePortDto,
- NotifyChargeOrderDto notifyChargeOrderDto,
- ChargeMachineDto chargeMachineDto,
- IChargeFactoryAdapt chargeFactoryAdapt) {
-
- String preEnergy = "0";
- ChargeMachineOrderDto chargeMachineOrderDto = new ChargeMachineOrderDto();
- chargeMachineOrderDto.setOrderId(notifyChargePortDto.getOrderId());
- List<ChargeMachineOrderDto> orderDtos = chargeMachineOrderV1InnerServiceSMOImpl.queryChargeMachineOrders(chargeMachineOrderDto);
-
- Assert.listOnlyOne(orderDtos, "璁㈠崟涓嶅瓨鍦�");
- String state = ChargeMachineOrderDto.STATE_DOING;
- if (preEnergy.equals(notifyChargePortDto.getEnergy())) {
- state = ChargeMachineOrderDto.STATE_FINISH;
- }
- updateOrderState(notifyChargePortDto, state);
-
- //todo 涓诲姩璋冪敤鍏抽棴
- if (preEnergy.equals(notifyChargePortDto.getEnergy())) {
- customStopCharge(notifyChargePortDto, chargeMachineDto, chargeFactoryAdapt, orderDtos);
- }
-
- // todo 1.0 鏌ヨ涓婃姤鏃堕棿鏄惁宸茬粡 鎵ｆ锛屽鏋滄墸娆捐繃锛岄偅涔堟洿鏂� 鍏呯數鐢甸噺 鍚庤繑鍥�
-
- String powerTime = DateUtil.getFormatTimeString(notifyChargePortDto.getPowerTime(), DateUtil.DATE_FORMATE_STRING_A);
-
- ChargeMachineOrderAcctDto chargeMachineOrderAcctDto = new ChargeMachineOrderAcctDto();
- chargeMachineOrderAcctDto.setOrderId(notifyChargeOrderDto.getOrderId());
- chargeMachineOrderAcctDto.setPowerTime(powerTime);
- List<ChargeMachineOrderAcctDto> chargeMachineOrderAcctDtos = chargeMachineOrderAcctV1InnerServiceSMOImpl.queryChargeMachineOrderAccts(chargeMachineOrderAcctDto);
-
- if (chargeMachineOrderAcctDtos != null && chargeMachineOrderAcctDtos.size() > 0) {
- return;
- }
-
- // todo 2.0 妫�鏌ヨ处鎴锋槸鍚︿綑棰濆厖瓒筹紝濡傛灉浣欓涓嶈冻锛屽垯 璋冪敤鍋滄鍏呯數 灏嗗厖鐢佃鍗� 淇敼鎴愬厖鐢靛畬鎴愶紝骞朵笖淇敼澶囨敞
-
- double price = Double.parseDouble(chargeMachineDto.getDurationPrice());
-
- AccountDto accountDto = new AccountDto();
- accountDto.setAcctId(orderDtos.get(0).getAcctDetailId());
- accountDto.setAcctType(AccountDto.ACCT_TYPE_CASH);
- List<AccountDto> accountDtos = accountInnerServiceSMOImpl.queryAccounts(accountDto);
-
- if (accountDtos == null || accountDtos.size() < 1) {
- throw new CmdException("璇峰厛鍏呭�硷紝璐︽埛閲戦涓嶈冻");
- }
-
- //todo 璐︽埛閲戦涓嶈冻锛屾棤娉曟敮浠樺皬鏃惰垂鐢�,鍋滄鍏呯數
- if (Double.parseDouble(accountDtos.get(0).getAmount()) < price) {
- customStopCharge(notifyChargePortDto, chargeMachineDto, chargeFactoryAdapt, orderDtos);
- updateOrderState(notifyChargePortDto, ChargeMachineOrderDto.STATE_FINISH);
- return;
- }
-
-
- // todo 3.0 璐︽埛鎵ｆ
- AccountDetailPo accountDetailPo = new AccountDetailPo();
- accountDetailPo.setAcctId(accountDtos.get(0).getAcctId());
- accountDetailPo.setObjId(accountDtos.get(0).getObjId());
- accountDetailPo.setObjType(accountDtos.get(0).getObjType());
- accountDetailPo.setAmount(price + "");
- accountDetailPo.setDetailId(GenerateCodeFactory.getGeneratorId(GenerateCodeFactory.CODE_PREFIX_detailId));
- accountInnerServiceSMOImpl.withholdAccount(accountDetailPo);
-
- ChargeMachineOrderAcctPo chargeMachineOrderAcctPo = new ChargeMachineOrderAcctPo();
- chargeMachineOrderAcctPo.setAcctDetailId(accountDetailPo.getDetailId());
- chargeMachineOrderAcctPo.setAmount(price + "");
- chargeMachineOrderAcctPo.setCmoaId(GenerateCodeFactory.getGeneratorId("11"));
- chargeMachineOrderAcctPo.setOrderId(notifyChargePortDto.getOrderId());
- chargeMachineOrderAcctPo.setAcctId(accountDtos.get(0).getAcctId());
- chargeMachineOrderAcctPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
- chargeMachineOrderAcctPo.setEndTime(DateUtil.getAddHoursStringA(DateUtil.getCurrentDate(), 1));
- chargeMachineOrderAcctPo.setRemark("涓�灏忔椂瀹氭椂鎵ｆ");
- chargeMachineOrderAcctPo.setCommunityId(orderDtos.get(0).getCommunityId());
- chargeMachineOrderAcctPo.setEnergy(notifyChargePortDto.getEnergy());
-
- chargeMachineOrderAcctV1InnerServiceSMOImpl.saveChargeMachineOrderAcct(chargeMachineOrderAcctPo);
-
- }
-
- private void updateOrderState(NotifyChargePortDto notifyChargePortDto, String state) {
- ChargeMachineOrderPo chargeMachineOrderPo = new ChargeMachineOrderPo();
- chargeMachineOrderPo.setOrderId(notifyChargePortDto.getOrderId());
- chargeMachineOrderPo.setEnergy(notifyChargePortDto.getEnergy());
- chargeMachineOrderPo.setState(state);
-
- chargeMachineOrderV1InnerServiceSMOImpl.updateChargeMachineOrder(chargeMachineOrderPo);
- }
-
- private void customStopCharge(NotifyChargePortDto notifyChargePortDto, ChargeMachineDto chargeMachineDto, IChargeFactoryAdapt chargeFactoryAdapt, List<ChargeMachineOrderDto> orderDtos) {
- ChargeMachinePortDto chargeMachinePortDto = new ChargeMachinePortDto();
- chargeMachinePortDto.setMachineId(orderDtos.get(0).getMachineId());
- chargeMachinePortDto.setPortCode(notifyChargePortDto.getPortCode());
- List<ChargeMachinePortDto> chargeMachinePortDtos = chargeMachinePortV1InnerServiceSMOImpl.queryChargeMachinePorts(chargeMachinePortDto);
- if (chargeMachinePortDtos != null && chargeMachinePortDtos.size() > 0) {
- chargeFactoryAdapt.stopCharge(chargeMachineDto, chargeMachinePortDtos.get(0));
+ 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