From 55e219a5802ab479b9a1c60b2130382a1318ba76 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 29 六月 2022 09:59:22 +0800
Subject: [PATCH] 充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 15 +++++++++++++--
1 files changed, 13 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..56a2898 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
@@ -26,7 +26,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;
@@ -134,7 +133,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 +167,7 @@
c3mOrderEntity.setPoleName(pole.getPoleName());
c3mOrderEntity.setC3Mac(c3m.getC3Mac());
c3mOrderEntity.setOrderStatus(0);
+ c3mOrderEntity.setUserCode(wxCode);
// 鎺ㄩ�佸埌鑷姩鏌ヨ妯″潡锛岃繘琛屾壂鎻忓惎鍔�
@@ -221,6 +221,14 @@
}
/**
+ * 鏍规嵁鐏潌id鑾峰彇鏈�杩戜竴鏉¤鍗�
+ */
+ public C3mOrder getLastOrderByPoleId(Long poleId) {
+ LambdaQueryWrapper<C3mOrder> wrapper = Wrappers.lambdaQuery(C3mOrder.class).eq(C3mOrder::getPoleId, poleId).last("limit 1");
+ return getOne(wrapper);
+ }
+
+ /**
* 璁㈠崟鍒楄〃
*
* @param baseConditionVO
@@ -232,4 +240,7 @@
List<C3mOrderBo> list = baseMapper.orderList(userId);
return list;
}
+
+
+
}
--
Gitblit v1.9.3