From f7ff2506b5d99bc8c22042d8f711f91690467b48 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期一, 24 四月 2023 23:37:54 +0800
Subject: [PATCH] 充电桩充电加入 充电月卡功能
---
service-common/src/main/java/com/java110/common/cmd/chargeMachine/StartChargeCmd.java | 67 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 22 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/StartChargeCmd.java b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/StartChargeCmd.java
index 19cd090..632dad5 100644
--- a/service-common/src/main/java/com/java110/common/cmd/chargeMachine/StartChargeCmd.java
+++ b/service-common/src/main/java/com/java110/common/cmd/chargeMachine/StartChargeCmd.java
@@ -13,6 +13,7 @@
import com.java110.dto.chargeMachine.ChargeMachineOrderDto;
import com.java110.dto.chargeMachine.ChargeMachinePortDto;
import com.java110.dto.chargeMachine.ChargeRuleFeeDto;
+import com.java110.dto.chargeMonthOrder.ChargeMonthOrderDto;
import com.java110.dto.couponPool.CouponPropertyPoolConfigDto;
import com.java110.dto.couponPool.CouponPropertyUserDto;
import com.java110.dto.user.UserDto;
@@ -39,6 +40,7 @@
import java.math.BigDecimal;
import java.text.ParseException;
import java.util.Calendar;
+import java.util.Date;
import java.util.List;
/**
@@ -83,6 +85,9 @@
@Autowired
private IChargeMachineOrderCouponV1InnerServiceSMO chargeMachineOrderCouponV1InnerServiceSMOImpl;
+
+ @Autowired
+ private IChargeMonthOrderV1InnerServiceSMO chargeMonthOrderV1InnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
@@ -138,6 +143,12 @@
List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
Assert.listOnlyOne(userDtos, "鐢ㄦ埛涓嶅瓨鍦�");
+
+ //todo 濡傛灉鏄� 鏈堝崱鍏呭�� 锛屽悗闈笉鍋氭牎楠�
+ if (chargeCoreImpl.ifMonthCard(userDtos.get(0).getTel(), chargeMachinePortDtos.get(0).getCommunityId())) {
+ return;
+ }
+
AccountDto accountDto = new AccountDto();
accountDto.setLink(userDtos.get(0).getTel());
@@ -254,6 +265,12 @@
}
resultVo.setData(orderId);
+ //todo 濡傛灉鏄� 鏈堝崱鍏呭�� 锛屽悗闈笉鍋氭牎楠�
+ if (chargeCoreImpl.ifMonthCard(userDtos.get(0).getTel(), chargeMachinePortDtos.get(0).getCommunityId())) {
+ monthCardOrder(reqJson, chargeMachineDtos, orderId, durationHours);
+ return;
+ }
+
//todo 浼樻儬鍒告姷鎵�
withholdCoupon(reqJson, chargeMachineDtos, orderId);
@@ -264,6 +281,34 @@
context.setResponseEntity(ResultVo.createResponseEntity(resultVo));
+ }
+
+ /**
+ * 鏈堝崱鏂瑰紡
+ *
+ * @param reqJson
+ * @param chargeMachineDtos
+ * @param orderId
+ * @param durationHours
+ */
+ private void monthCardOrder(JSONObject reqJson, List<ChargeMachineDto> chargeMachineDtos, String orderId, double durationHours) {
+
+ ChargeMachineOrderAcctPo chargeMachineOrderAcctPo = new ChargeMachineOrderAcctPo();
+ chargeMachineOrderAcctPo.setAcctDetailId("-1");
+ chargeMachineOrderAcctPo.setAmount("0");
+
+ chargeMachineOrderAcctPo.setCmoaId(GenerateCodeFactory.getGeneratorId("11"));
+ chargeMachineOrderAcctPo.setOrderId(orderId);
+ chargeMachineOrderAcctPo.setAcctId("-1");
+ chargeMachineOrderAcctPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
+ chargeMachineOrderAcctPo.setEndTime(DateUtil.getAddHoursStringA(DateUtil.getCurrentDate(), new Double(Math.ceil(durationHours)).intValue()));
+ chargeMachineOrderAcctPo.setRemark("鏈堝崱鎶垫墸");
+ chargeMachineOrderAcctPo.setCommunityId(chargeMachineDtos.get(0).getCommunityId());
+ chargeMachineOrderAcctPo.setEnergy("0");
+ chargeMachineOrderAcctPo.setDurationPrice(reqJson.getString("durationPrice"));
+
+
+ chargeMachineOrderAcctV1InnerServiceSMOImpl.saveChargeMachineOrderAcct(chargeMachineOrderAcctPo);
}
/**
@@ -322,33 +367,11 @@
chargeMachineOrderCouponPo.setCmocId(GenerateCodeFactory.getGeneratorId("11"));
chargeMachineOrderCouponPo.setHours(value + "");
chargeMachineOrderCouponV1InnerServiceSMOImpl.saveChargeMachineOrderCoupon(chargeMachineOrderCouponPo);
-
-// couponNames += ("浼樻儬鍒稿悕绉帮細" + couponPropertyUserDtos.get(0).getCouponName() + "(" + couponId + "),灏忔椂锛�"+value+";");
-//
-// hours += value;
} finally {
DistributedLock.releaseDistributedLock(requestId, key);
}
}
-// hours = Math.ceil(hours);
-
-// ChargeMachineOrderAcctPo chargeMachineOrderAcctPo = new ChargeMachineOrderAcctPo();
-// chargeMachineOrderAcctPo.setAcctDetailId("-1");
-// chargeMachineOrderAcctPo.setAmount("0");
-// chargeMachineOrderAcctPo.setCmoaId(GenerateCodeFactory.getGeneratorId("11"));
-// chargeMachineOrderAcctPo.setOrderId(orderId);
-// chargeMachineOrderAcctPo.setAcctId(reqJson.getString("acctId"));
-// chargeMachineOrderAcctPo.setStartTime(DateUtil.getNow(DateUtil.DATE_FORMATE_STRING_A));
-// chargeMachineOrderAcctPo.setEndTime(DateUtil.getAddHoursStringA(DateUtil.getCurrentDate(), new Double(hours).intValue()));
-// chargeMachineOrderAcctPo.setRemark("浼樻儬鍒告姷鎵�," + couponNames);
-// chargeMachineOrderAcctPo.setCommunityId(chargeMachineDtos.get(0).getCommunityId());
-// chargeMachineOrderAcctPo.setEnergy("0");
-// chargeMachineOrderAcctPo.setDurationPrice(reqJson.getString("durationPrice"));
-//
-// chargeMachineOrderAcctV1InnerServiceSMOImpl.saveChargeMachineOrderAcct(chargeMachineOrderAcctPo);
-
-// return hours;
}
/**
--
Gitblit v1.8.0