From 2e91f5c17fb67d24d16365ea4bc91a8d423ce6a0 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 29 六月 2022 14:05:09 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 73 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 2 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 583b1f5..c2dee2e 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,8 @@
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;
import com.sandu.ximon.admin.pay.wx.WxFastPayService;
@@ -26,7 +28,6 @@
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,6 +48,13 @@
private final OrderQueryListener orderQueryListener;
private final Snowflake snowflake;
+ /**
+ * 閫�娆�
+ *
+ * @param outTradeNo
+ * @param refundAmount
+ * @return
+ */
public boolean orderRefund(String outTradeNo, Double refundAmount/*, Long userId, String username*/) {
Long userId = SecurityUtils.getUserId();
String username = SecurityUtils.getUsername();
@@ -134,7 +142,7 @@
* @return
*/
public C3mOrder advancePayOrder(Long streetlightId, C3mCharging c3m, String orderType, Double totalAmount,
- Integer subscribeChargingCapacity) {
+ Integer subscribeChargingCapacity, String wxCode) {
// 鍒ゆ柇璇ュ厖鐢垫々鏄惁瀛樺湪姝ｅ湪杩涜涓殑璁㈠崟
String chargingJson = redisUtils.get(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3m.getC3Mac());
@@ -168,6 +176,7 @@
c3mOrderEntity.setPoleName(pole.getPoleName());
c3mOrderEntity.setC3Mac(c3m.getC3Mac());
c3mOrderEntity.setOrderStatus(0);
+ c3mOrderEntity.setUserCode(wxCode);
// 鎺ㄩ�佸埌鑷姩鏌ヨ妯″潡锛岃繘琛屾壂鎻忓惎鍔�
@@ -221,6 +230,32 @@
}
/**
+ * 鏍规嵁鐏潌id鑾峰彇鏈�杩戜竴鏉¤鍗�
+ */
+ public C3mOrder getLastOrderByPoleId(Long poleId) {
+ LambdaQueryWrapper<C3mOrder> wrapper = Wrappers.lambdaQuery(C3mOrder.class).eq(C3mOrder::getPoleId, poleId).last("limit 1");
+ return getOne(wrapper);
+ }
+
+
+ /**
+ * 鏍规嵁蹇冭烦鍖呮洿鏂拌鍗曠姸鎬�
+ */
+ 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"));
+ if (c3mOrder == null) {
+ return;
+ }
+ //鏇存柊鍏呯數鎬婚噺
+ c3mOrder.setActualChargingCapacityHide(Double.parseDouble(dataPackage.getChargedCapacity()));
+ //鏇存柊鍓╀綑閲戦
+ c3mOrder.setSurplusAmount(Double.parseDouble(dataPackage.getRemainingAmount()));
+ updateById(c3mOrder);
+ }
+
+
+ /**
* 璁㈠崟鍒楄〃
*
* @param baseConditionVO
@@ -232,4 +267,38 @@
List<C3mOrderBo> list = baseMapper.orderList(userId);
return list;
}
+
+
+ /**
+ * 鑾峰彇鍒涘缓鏃堕棿瓒呰繃10鍒嗛挓鐨勮鍗� 骞朵笖娌℃湁鏀粯鐨勮鍗�
+ */
+ public void getOrderListByCreateTime() {
+ // 鑾峰彇褰撳墠鏃堕棿鎴�
+ long time = new Date().getTime();
+ //鍒犻櫎瓒呰繃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