From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-common/src/main/java/com/java110/common/charge/ChargeCoreImpl.java | 203 +++++++++++++++++++++++++++++++++++++-------------
1 files changed, 151 insertions(+), 52 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 96959e5..05edf8b 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
@@ -3,28 +3,28 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.core.factory.GenerateCodeFactory;
import com.java110.dto.account.AccountDto;
-import com.java110.dto.chargeMachine.ChargeMachineDto;
-import com.java110.dto.chargeMachineFactory.ChargeMachineFactoryDto;
-import com.java110.dto.chargeMachineOrder.ChargeMachineOrderDto;
-import com.java110.dto.chargeMachineOrder.NotifyChargeOrderDto;
-import com.java110.dto.chargeMachineOrderCoupon.ChargeMachineOrderCouponDto;
-import com.java110.dto.chargeMachinePort.ChargeMachinePortDto;
-import com.java110.dto.chargeRuleFee.ChargeRuleFeeDto;
+import com.java110.dto.charge.ChargeMachineDto;
+import com.java110.dto.charge.ChargeMachineFactoryDto;
+import com.java110.dto.charge.ChargeMachineOrderDto;
+import com.java110.dto.charge.NotifyChargeOrderDto;
+import com.java110.dto.charge.ChargeMachineOrderCouponDto;
+import com.java110.dto.charge.ChargeMachinePortDto;
+import com.java110.dto.charge.ChargeRuleFeeDto;
+import com.java110.dto.charge.ChargeMonthOrderDto;
import com.java110.intf.acct.IAccountInnerServiceSMO;
import com.java110.intf.common.*;
-import com.java110.po.accountDetail.AccountDetailPo;
-import com.java110.po.chargeMachineOrder.ChargeMachineOrderPo;
-import com.java110.po.chargeMachineOrderAcct.ChargeMachineOrderAcctPo;
-import com.java110.po.chargeMachineOrderCoupon.ChargeMachineOrderCouponPo;
-import com.java110.po.chargeMachinePort.ChargeMachinePortPo;
+import com.java110.po.account.AccountDetailPo;
+import com.java110.po.charge.ChargeMachineOrderPo;
+import com.java110.po.charge.ChargeMachineOrderAcctPo;
+import com.java110.po.charge.ChargeMachineOrderCouponPo;
+import com.java110.po.charge.ChargeMachinePortPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.factory.ApplicationContextFactory;
import com.java110.utils.util.Assert;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
@@ -60,6 +60,9 @@
@Autowired
private IChargeMachineOrderCouponV1InnerServiceSMO chargeMachineOrderCouponV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IChargeMonthOrderV1InnerServiceSMO chargeMonthOrderV1InnerServiceSMOImpl;
@Override
@@ -104,10 +107,6 @@
}
- //璁㈠崟閫�娆� 杩欓噷涓嶆搷浣滐紝浠ヨ澶� 閫氱煡涓轰富
- // returnOrderMoney(chargeMachineDto, chargeMachinePortDto, "鐢ㄦ埛鎵嬪伐缁撴潫");
-
-
return resultVo;
}
@@ -115,25 +114,12 @@
* 璁㈠崟閫�娆�
*
* @param chargeMachineDto
- * @param chargeMachinePortDto
*/
- private void returnOrderMoney(ChargeMachineDto chargeMachineDto, ChargeMachinePortDto chargeMachinePortDto, String remark, String energy) {
- // 閫�娆�
- ChargeMachineOrderDto chargeMachineOrderDto = new ChargeMachineOrderDto();
- chargeMachineOrderDto.setMachineId(chargeMachineDto.getMachineId());
- chargeMachineOrderDto.setPortId(chargeMachinePortDto.getPortId());
- chargeMachineOrderDto.setState(ChargeMachineOrderDto.STATE_DOING);
- List<ChargeMachineOrderDto> chargeMachineOrderDtos = chargeMachineOrderV1InnerServiceSMOImpl.queryChargeMachineOrders(chargeMachineOrderDto);
+ private void returnOrderMoney(ChargeMachineDto chargeMachineDto,
+ String remark,
+ String energy,
+ List<ChargeMachineOrderDto> chargeMachineOrderDtos) {
- 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());
@@ -141,19 +127,28 @@
calendar.add(Calendar.MINUTE, -2); // 杩欓噷鍑忔帀涓ゅ垎閽燂紝璁惧鍙嶅簲閫氱煡骞冲彴鐨勬椂闂�
double usedHours = Math.ceil((calendar.getTime().getTime() - startTime.getTime()) / (60 * 60 * 1000.00));
- if (usedHours < 0) {
+ // 璁＄畻骞冲潎鍔熺巼
+ String power = energy;
+ if (usedHours <= 0) {
usedHours = 0;
+ } else {
+ BigDecimal powerDec = new BigDecimal(Double.parseDouble(energy)).divide(new BigDecimal(usedHours), 2, BigDecimal.ROUND_HALF_UP);
+ power = powerDec.doubleValue() + "";
}
// todo 浼樻儬鍒告姷鎵�
JSONObject result = useCoupon(usedHours, chargeMachineOrderDtos);
usedHours = result.getDoubleValue("usedHours");
- remark += result.getString("remark");
+ if (StringUtil.isEmpty(remark)) {
+ remark = result.getString("remark");
+ } else {
+ remark = remark + ";" + result.getString("remark");
+ }
ChargeRuleFeeDto chargeRuleFeeDto = new ChargeRuleFeeDto();
chargeRuleFeeDto.setRuleId(chargeMachineDto.getRuleId());
chargeRuleFeeDto.setCommunityId(chargeMachineDto.getCommunityId());
- chargeRuleFeeDto.setEnergy(energy);
+ chargeRuleFeeDto.setEnergy(power);
List<ChargeRuleFeeDto> chargeRuleFeeDtos = chargeRuleFeeV1InnerServiceSMOImpl.queryChargeRuleFees(chargeRuleFeeDto);
if (chargeRuleFeeDtos == null || chargeRuleFeeDtos.size() < 1) {
@@ -165,7 +160,7 @@
}
if (chargeRuleFeeDtos == null || chargeRuleFeeDtos.size() < 1) {
- return;
+ throw new CmdException("鏈壘鍒版敹璐硅鍒�");
}
String durationPrice = chargeRuleFeeDtos.get(chargeRuleFeeDtos.size() - 1).getDurationPrice();
@@ -237,6 +232,72 @@
chargeMachineOrderAcctV1InnerServiceSMOImpl.saveChargeMachineOrderAcct(chargeMachineOrderAcctPo);
}
+ public boolean ifMonthCard(String personTel, String communityId ) {
+
+ ChargeMonthOrderDto chargeMonthOrderDto = new ChargeMonthOrderDto();
+ chargeMonthOrderDto.setPersonTel(personTel);
+ chargeMonthOrderDto.setCommunityId(communityId);
+ chargeMonthOrderDto.setQueryTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ List<ChargeMonthOrderDto> chargeMonthOrderDtos = chargeMonthOrderV1InnerServiceSMOImpl.queryChargeMonthOrders(chargeMonthOrderDto);
+ if (chargeMonthOrderDtos == null || chargeMonthOrderDtos.size() < 1) {
+ return false;
+ }
+
+ //todo 浠婂ぉ鏄惁鍙堝厖杩囩數
+ ChargeMachineOrderDto chargeMachineOrderDto = new ChargeMachineOrderDto();
+ chargeMachineOrderDto.setPersonTel(personTel);
+ chargeMachineOrderDto.setCommunityId(communityId);
+ chargeMachineOrderDto.setQueryTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B));
+ chargeMachineOrderDto.setState(ChargeMachineOrderDto.STATE_FINISH);
+ int count = chargeMachineOrderV1InnerServiceSMOImpl.queryChargeMachineOrdersCount(chargeMachineOrderDto);
+
+ if(count >1){
+ return false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public boolean ifStartMonthCard(String personTel, String communityId ) {
+
+ ChargeMonthOrderDto chargeMonthOrderDto = new ChargeMonthOrderDto();
+ chargeMonthOrderDto.setPersonTel(personTel);
+ chargeMonthOrderDto.setCommunityId(communityId);
+ chargeMonthOrderDto.setQueryTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ List<ChargeMonthOrderDto> chargeMonthOrderDtos = chargeMonthOrderV1InnerServiceSMOImpl.queryChargeMonthOrders(chargeMonthOrderDto);
+ if (chargeMonthOrderDtos == null || chargeMonthOrderDtos.size() < 1) {
+ return false;
+ }
+
+ //todo 浠婂ぉ鏄惁鍙堝厖杩囩數
+ ChargeMachineOrderDto chargeMachineOrderDto = new ChargeMachineOrderDto();
+ chargeMachineOrderDto.setPersonTel(personTel);
+ chargeMachineOrderDto.setCommunityId(communityId);
+ chargeMachineOrderDto.setQueryStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_B));
+ chargeMachineOrderDto.setQueryEndTime(DateUtil.getAddDayStringB(DateUtil.getCurrentDate(),1));
+ chargeMachineOrderDto.setState(ChargeMachineOrderDto.STATE_FINISH);
+ List<ChargeMachineOrderDto> chargeMachineOrderDtos = chargeMachineOrderV1InnerServiceSMOImpl.queryChargeMachineOrders(chargeMachineOrderDto);
+
+ if (chargeMachineOrderDtos == null || chargeMachineOrderDtos.size() < 1) {
+ return true;
+ }
+
+
+ Date startTime = DateUtil.getDateFromStringA(chargeMachineOrderDtos.get(0).getStartTime());
+ Date endTime = DateUtil.getDateFromStringA(chargeMachineOrderDtos.get(0).getEndTime());
+
+
+ double usedHours = (endTime.getTime() - startTime.getTime()) / (60 * 60 * 1000.00);
+
+ if (usedHours < 1) {
+ return true;
+ }
+
+ return false;
+ }
+
+
/**
* 浼樻儬鍒告姷鎵� 灏忔椂
*
@@ -261,9 +322,9 @@
useHoursInfo.put("remark", "");
return useHoursInfo;
}
- String couponNames = "";
+ String couponNames = "浣跨敤浼樻儬鍒�-";
for (ChargeMachineOrderCouponDto tmpChargeMachineOrderCouponDto : chargeMachineOrderCouponDtos) {
- couponNames += ("浼樻儬鍒稿悕绉帮細" + tmpChargeMachineOrderCouponDto.getCouponName() + "(" + tmpChargeMachineOrderCouponDto.getCouponId() + "),灏忔椂锛�" + tmpChargeMachineOrderCouponDto.getHours() + ";");
+ couponNames += ("鍚嶇О锛�" + tmpChargeMachineOrderCouponDto.getCouponName() + "(" + tmpChargeMachineOrderCouponDto.getCouponId() + "),灏忔椂锛�" + tmpChargeMachineOrderCouponDto.getHours() + ";");
hours += Double.parseDouble(tmpChargeMachineOrderCouponDto.getHours());
}
@@ -312,18 +373,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, "鎴愬姛");
@@ -334,11 +387,11 @@
ChargeMachinePortDto chargeMachinePortDto = new ChargeMachinePortDto();
chargeMachinePortDto.setMachineId(chargeMachineDtos.get(0).getMachineId());
chargeMachinePortDto.setPortCode(notifyChargeOrderDto.getPortCode());
- chargeMachinePortDto.setState(ChargeMachinePortDto.STATE_WORKING);
+ //chargeMachinePortDto.setState(ChargeMachinePortDto.STATE_WORKING);
List<ChargeMachinePortDto> chargeMachinePortDtos = chargeMachinePortV1InnerServiceSMOImpl.queryChargeMachinePorts(chargeMachinePortDto);
//Assert.listOnlyOne(chargeMachinePortDtos, "鎻掓Ы绌洪棽");
if (chargeMachinePortDtos == null || chargeMachinePortDtos.size() < 1) {
- return new ResultVo(ResultVo.CODE_OK, "鎴愬姛");
+ throw new CmdException("鎻掑骇涓嶅瓨鍦�");
}
ChargeMachinePortPo chargeMachinePortPo = new ChargeMachinePortPo();
@@ -346,11 +399,57 @@
chargeMachinePortPo.setState(ChargeMachinePortDto.STATE_FREE);
chargeMachinePortV1InnerServiceSMOImpl.updateChargeMachinePort(chargeMachinePortPo);
- returnOrderMoney(chargeMachineDtos.get(0), chargeMachinePortDtos.get(0), notifyChargeOrderDto.getReason(), notifyChargeOrderDto.getEnergy());
+ ChargeMachineOrderDto chargeMachineOrderDto = new ChargeMachineOrderDto();
+ chargeMachineOrderDto.setMachineId(chargeMachineDtos.get(0).getMachineId());
+ chargeMachineOrderDto.setPortId(chargeMachinePortDtos.get(0).getPortId());
+ chargeMachineOrderDto.setState(ChargeMachineOrderDto.STATE_DOING);
+ List<ChargeMachineOrderDto> chargeMachineOrderDtos = chargeMachineOrderV1InnerServiceSMOImpl.queryChargeMachineOrders(chargeMachineOrderDto);
+
+ if (chargeMachineOrderDtos == null || chargeMachineOrderDtos.size() < 1) {
+ 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);
+ return new ResultVo(ResultVo.CODE_OK, "鎴愬姛");
+ }
+
+ returnOrderMoney(chargeMachineDtos.get(0), notifyChargeOrderDto.getReason(), notifyChargeOrderDto.getEnergy(),chargeMachineOrderDtos);
return new ResultVo(ResultVo.CODE_OK, "鎴愬姛");
}
+ /**
+ * 缁撴潫鏈堝崱 鍏呯數璁㈠崟
+ * @param notifyChargeOrderDto
+ * @param chargeMachineOrderDtos
+ */
+ private void finishMonthCardChargeOrder(NotifyChargeOrderDto notifyChargeOrderDto, List<ChargeMachineOrderDto> chargeMachineOrderDtos) {
+ ChargeMachineOrderPo chargeMachineOrderPo = new ChargeMachineOrderPo();
+ chargeMachineOrderPo.setOrderId(chargeMachineOrderDtos.get(0).getOrderId());
+ chargeMachineOrderPo.setRemark(notifyChargeOrderDto.getReason());
+ chargeMachineOrderPo.setState(ChargeMachineOrderDto.STATE_FINISH);
+ chargeMachineOrderPo.setAmount("0");
+ chargeMachineOrderPo.setEndTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ chargeMachineOrderPo.setCommunityId(chargeMachineOrderDtos.get(0).getCommunityId());
+ //chargeMachineOrderPo.setDurationPrice(durationPrice);
+ chargeMachineOrderPo.setEnergy(notifyChargeOrderDto.getEnergy());
+ int flag = chargeMachineOrderV1InnerServiceSMOImpl.updateChargeMachineOrder(chargeMachineOrderPo);
+ if (flag < 1) {
+ throw new IllegalArgumentException("淇敼璁㈠崟澶辫触");
+ }
+ }
+
@Override
public ResultVo workHeartbeat(NotifyChargeOrderDto notifyChargeOrderDto) {
--
Gitblit v1.8.0