From 8604636eb2547e005ebf9dbe181900b62e81cb03 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 29 六月 2022 14:07:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 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 49b621b..ecc51d0 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
@@ -9,6 +9,7 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
import com.sandu.ximon.admin.pay.OrderStatusEnums;
@@ -27,6 +28,7 @@
import com.sandu.ximon.dao.mapper.C3mOrderMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.Date;
import java.util.List;
@@ -47,8 +49,11 @@
private final OrderQueryListener orderQueryListener;
private final Snowflake snowflake;
+ private final C3ChargingService c3ChargingService;
+
/**
* 閫�娆�
+ *
* @param outTradeNo
* @param refundAmount
* @return
@@ -139,13 +144,23 @@
* @param subscribeChargingCapacity
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
public C3mOrder advancePayOrder(Long streetlightId, C3mCharging c3m, String orderType, Double totalAmount,
Integer subscribeChargingCapacity, String wxCode) {
// 鍒ゆ柇璇ュ厖鐢垫々鏄惁瀛樺湪姝ｅ湪杩涜涓殑璁㈠崟
String chargingJson = redisUtils.get(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3m.getC3Mac());
if (null != chargingJson) {
- return null;
+ throw new BusinessException("璇ュ厖鐢垫々宸插瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�");
+ }
+ //鏌ヨ鍏呯數妗╂槸鍚﹀瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�
+ C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
+ .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getChargingStates, 1).last("limit 1"));
+ if (c3mOrder != null) {
+ throw new BusinessException("璇ュ厖鐢垫々宸插瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�");
+ }
+ if (!c3mOrder.getUserCode().equals(wxCode)) {
+ throw new BusinessException("璇ュ厖鐢垫々姝ｅ湪琚埆浜轰娇鐢�");
}
Pole pole = poleService.getById(streetlightId);
if (null == pole) {
@@ -175,6 +190,7 @@
c3mOrderEntity.setC3Mac(c3m.getC3Mac());
c3mOrderEntity.setOrderStatus(0);
c3mOrderEntity.setUserCode(wxCode);
+ c3mOrderEntity.setC3Udid(c3m.getMcuUdid());
// 鎺ㄩ�佸埌鑷姩鏌ヨ妯″潡锛岃繘琛屾壂鎻忓惎鍔�
@@ -209,9 +225,12 @@
return WxPayNotifyResponse.fail("鏇存柊鏁版嵁宸插け鏁�");
}
/**
- * 璋冭捣寮�濮嬪厖鐢垫帴鍙� // TODO
+ * 璋冭捣寮�濮嬪厖鐢垫帴鍙�
*/
-
+ String s = c3ChargingService.startCharging(userOrder.getC3Mac(), userOrder.getSubscribeChargingCapacity(), userOrder.getTotalAmount());
+ if (s.isEmpty() || s == null) {
+ throw new BusinessException("寮�鍚厖鐢靛け璐�");
+ }
return WxPayNotifyResponse.success("鏇存柊鏁版嵁鎴愬姛");
}
@@ -228,10 +247,10 @@
}
/**
- * 鏍规嵁鐏潌id鑾峰彇鏈�杩戜竴鏉¤鍗�
+ * 鏍规嵁c3Mac鑾峰彇鏈�杩戜竴鏉¤鍗�
*/
- public C3mOrder getLastOrderByPoleId(Long poleId) {
- LambdaQueryWrapper<C3mOrder> wrapper = Wrappers.lambdaQuery(C3mOrder.class).eq(C3mOrder::getPoleId, poleId).last("limit 1");
+ public C3mOrder getLastOrderByC3Mac(String c3Mac) {
+ LambdaQueryWrapper<C3mOrder> wrapper = Wrappers.lambdaQuery(C3mOrder.class).eq(C3mOrder::getC3Mac, c3Mac).last("limit 1");
return getOne(wrapper);
}
@@ -241,7 +260,7 @@
*/
public void updateOrderStatusByHeartbeat(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class).eq(C3mOrder::getC3Mac, dataPackage.getC3Mac())
- .eq(C3mOrder::getChargingStates,1).last("limit 1"));
+ .eq(C3mOrder::getChargingStates, 1).last("limit 1"));
if (c3mOrder == null) {
return;
}
@@ -272,9 +291,31 @@
*/
public void getOrderListByCreateTime() {
// 鑾峰彇褰撳墠鏃堕棿鎴�
- long time = new Date().getTime();
+ Long time = System.currentTimeMillis();
//鍒犻櫎瓒呰繃10鍒嗛挓鏈粯娆剧殑璁㈠崟
remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, time).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);
+ }
+ }
+
}
--
Gitblit v1.9.3