From 313a83d090e83bf7d2f8f7c9c70807a6486bc690 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 26 八月 2022 14:52:56 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 70 +++++++++++++++++++----------------
1 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
index 8ce4eab..8f16fd1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java
@@ -15,20 +15,16 @@
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
+import com.sandu.ximon.admin.dto.ChargingDto;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
import com.sandu.ximon.admin.pay.OrderStatusEnums;
import com.sandu.ximon.admin.pay.wx.WxFastPayService;
import com.sandu.ximon.admin.pay.wxpay.UsrWxPayConfigService;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.admin.security.order.OrderQueryListener;
import com.sandu.ximon.admin.utils.AliPayUtils;
-import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.vo.C3mOrderVO;
import com.sandu.ximon.dao.bo.C3mOrderBo;
-import com.sandu.ximon.dao.domain.C3mCharging;
-import com.sandu.ximon.dao.domain.C3mOrder;
-import com.sandu.ximon.dao.domain.Pole;
-import com.sandu.ximon.dao.domain.WxConfigEntity;
+import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.OrderStatus;
import com.sandu.ximon.dao.enums.OrderType;
import com.sandu.ximon.dao.mapper.C3mOrderMapper;
@@ -40,6 +36,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
@@ -55,11 +52,9 @@
@AllArgsConstructor
public class C3mOrderService extends BaseServiceImpl<C3mOrderMapper, C3mOrder> {
- private final RedisUtils redisUtils;
private final PoleService poleService;
private final C3mOrderMapper c3mOrderMapper;
private final WxFastPayService fastPayService;
- private final OrderQueryListener orderQueryListener;
private final Snowflake snowflake;
private final C3ChargingService c3ChargingService;
@@ -146,10 +141,10 @@
*/
@Transactional(rollbackFor = Exception.class)
public C3mOrder advancePayOrder(Long streetlightId, C3mCharging c3m, String orderType, Double totalAmount,
- Integer subscribeChargingCapacity, String wxCode) {
+ Integer subscribeChargingCapacity, String wxCode) throws InterruptedException {
//鏌ヨ鍏呯數妗╂槸鍚﹀瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�
C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
- .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).last("limit 1"));
+ .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getC3Mac, c3m.getC3Mac()).last("limit 1"));
//鍏呯數妗╂鍦ㄥ厖鐢典腑
if (c3mOrder != null && c3mOrder.getChargingStates() != null && c3mOrder.getChargingStates() == 0) {
@@ -187,6 +182,37 @@
c3mOrderEntity.setRefundAmount(totalAmount);
c3mOrderEntity.setSurplusAmount(totalAmount);
+ //纭鍏呯數妗╃姸鎬�
+ ChargingDto chargingInfo = c3ChargingService.getChargingInfo(streetlightId.toString());
+ if (chargingInfo.getStatusBit() != 1) {
+ throw new BusinessException("鍏呯數妗╅潪绌洪棽鐘舵��,鏃犳硶鍒涘缓璁㈠崟!");
+ }
+ Thread.sleep(500);
+
+ //鍚屾鏃堕棿鎴�
+ System.out.println("鍚屾鏃堕棿鎴冲紑濮�");
+ String date = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
+ String s = c3ChargingService.SetCalendar(c3m.getC3Mac(), Integer.parseInt(date.substring(0, 2)), Integer.parseInt(date.substring(2, 4)),
+ Integer.parseInt(date.substring(4, 6)), Integer.parseInt(date.substring(6, 8)),
+ Integer.parseInt(date.substring(8, 10)), Integer.parseInt(date.substring(10, 12)), true);
+ log.error("鍚屾鏃堕棿鎴崇粨鏋� : " + s);
+ if (!"鎿嶄綔鎴愬姛".equals(s)) {
+ throw new BusinessException(s + "!");
+ }
+ Thread.sleep(500);
+
+ //鍚屾璐圭巼
+ List<C3mChargingCharge> list = SpringContextHolder.getBean(C3mChargingChargeService.class)
+ .list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3m.getC3Id()));
+ if (list == null && list.size() == 0) {
+ //璐圭巼琛ㄤ腑娌℃湁姝ゅ厖鐢垫々鏁版嵁鏃� 娣诲姞榛樿璐圭巼
+ SpringContextHolder.getBean(C3mChargingChargeService.class).initCharge((c3m.getC3Id()).intValue());
+ }
+ String rateState = c3ChargingService.setRate(c3m.getC3Mac(), list, true);
+ log.error("璐圭巼璁剧疆缁撴灉 : " + rateState);
+ if (!"鎿嶄綔鎴愬姛".equals(rateState)) {
+ throw new BusinessException(s + "!");
+ }
if (save(c3mOrderEntity)) {
return c3mOrderEntity;
@@ -362,28 +388,6 @@
remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, timeMinus10).eq(C3mOrder::getOrderStatus, 0));
}
- /**
- * 鎭㈠缁х画鍏呯數
- *
- * @param c3Mac
- * @param mcuUdid
- */
- public void recoverContinueCharing(String c3Mac, String mcuUdid) {
- C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class).
- eq(C3mOrder::getC3Mac, c3Mac).eq(C3mOrder::getC3Udid, mcuUdid).eq(C3mOrder::getChargingStates, 0).last("limit 1"));
- if (c3mOrder != null) {
- c3mOrder.setActualChargingCapacity(c3mOrder.getActualChargingCapacityHide());
- c3mOrder.setActualChargingCapacityHide(0.00);
-
- //鍐嶆鍏呯數鐢甸噺
- double electricity = c3mOrder.getSubscribeChargingCapacity() - c3mOrder.getActualChargingCapacity();
- Integer chargingCapacity = Integer.valueOf(String.valueOf(Math.floor(electricity)));
- //鍐嶆鍏呯數閲戦
- double chargeAmount = c3mOrder.getSurplusAmount();
- SpringContextHolder.getBean(C3ChargingService.class).startCharging(c3Mac, chargingCapacity, chargeAmount);
- }
- }
-
/**
* 鍏呯數妗╂晠闅滄儏鍐典笅,缁撴灉鏁呴殰鍓嶆鍦ㄨ繘琛屼腑鐨勮鍗�
@@ -412,6 +416,8 @@
c3mOrder.setSurplusAmount(Double.parseDouble(dataPackage.getRemainingAmount()));
//缁撴潫鍏呯數(璁㈠崟)鏃堕棿
c3mOrder.setStopChargingTimestamp(System.currentTimeMillis());
+ //鍏呯數鏃堕暱
+ c3mOrder.setAlreadyChargingTime(dataPackage.getAlreadyChargingTime());
updateById(c3mOrder);
}
}
--
Gitblit v1.9.3