From ae2e17d478f444a5c9c054dc13b83a0dbdd750bd Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 30 六月 2022 11:35:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 71 +++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 24 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 c2dee2e..a3c6b01 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
@@ -28,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;
@@ -48,17 +49,19 @@
private final OrderQueryListener orderQueryListener;
private final Snowflake snowflake;
+ private final C3ChargingService c3ChargingService;
+
/**
* 閫�娆�
*
* @param outTradeNo
- * @param refundAmount
* @return
*/
- public boolean orderRefund(String outTradeNo, Double refundAmount/*, Long userId, String username*/) {
+ public boolean orderRefund(String outTradeNo, Double amt) {
Long userId = SecurityUtils.getUserId();
String username = SecurityUtils.getUsername();
C3mOrder orderByOutTradeNo = c3mOrderMapper.getOrderByOutTradeNo(outTradeNo);
+ Double refundAmount = orderByOutTradeNo.getSurplusAmount();
if (orderByOutTradeNo.getTotalAmount() < refundAmount) {
throw new BusinessException("閫�娆鹃噾棰濋敊璇�,涓嶈兘澶т簬浠樻閲戦");
}
@@ -100,11 +103,12 @@
C3mOrder.getPoleId()
);
}
- C3mOrder.setRefundTimestamp(new Date().getTime());
+ C3mOrder.setRefundTimestamp(System.currentTimeMillis());
C3mOrder.setRefundMsg(msg);
if (b) {
C3mOrder.setOrderStatus(OrderStatus.REFUND.getStatus());
- c3mOrderMapper.updateRefundOrder(C3mOrder);
+ c3mOrderMapper.updateRefundOrder(C3mOrder); // TODO: 閫�娆炬棩蹇�
+
/* logService.log(
userId,
ServerTask.SERVER_TASK,
@@ -141,13 +145,24 @@
* @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, 0).last("limit 1"));
+
+ if (c3mOrder != null && !c3mOrder.getUserCode().equals(wxCode)) {
+ throw new BusinessException("璇ュ厖鐢垫々姝ｅ湪琚埆浜轰娇鐢�");
+ }
+ if (c3mOrder != null) {
+ throw new BusinessException("璇ュ厖鐢垫々宸插瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�");
}
Pole pole = poleService.getById(streetlightId);
if (null == pole) {
@@ -177,6 +192,7 @@
c3mOrderEntity.setC3Mac(c3m.getC3Mac());
c3mOrderEntity.setOrderStatus(0);
c3mOrderEntity.setUserCode(wxCode);
+ c3mOrderEntity.setC3Udid(c3m.getMcuUdid());
// 鎺ㄩ�佸埌鑷姩鏌ヨ妯″潡锛岃繘琛屾壂鎻忓惎鍔�
@@ -194,7 +210,6 @@
WxPayOrderNotifyResult wxPayOrderNotifyResult = fastPayService.parseOrderNotifyResult(xmlData);
String orderSn = wxPayOrderNotifyResult.getOutTradeNo();
String transactionId = wxPayOrderNotifyResult.getOutTradeNo();
- Integer totalFee = wxPayOrderNotifyResult.getTotalFee();
C3mOrder userOrder = getByOrderSn(orderSn);
if (userOrder == null) {
return WxPayNotifyResponse.fail("璁㈠崟涓嶅瓨鍦� sn=" + orderSn);
@@ -207,13 +222,18 @@
userOrder.setOutTradeNo(transactionId);
userOrder.setPayTimestamp(new Date().getTime());
userOrder.setOrderStatus(OrderStatusEnums.PAID.getCode());
+ /**
+ * 璋冭捣寮�濮嬪厖鐢垫帴鍙�
+ */
+ String s = c3ChargingService.startCharging(userOrder.getC3Mac(), userOrder.getSubscribeChargingCapacity(), userOrder.getTotalAmount());
+ if (s.isEmpty() || s == null) {
+ throw new BusinessException("寮�鍚厖鐢靛け璐�");
+ }
+ //寮�鍚厖鐢垫垚鍔熷悗锛屾洿鏂拌鍗曠姸鎬佷负鍏呯數涓�
+ userOrder.setChargingStates(0);
if (!updateById(userOrder)) {
return WxPayNotifyResponse.fail("鏇存柊鏁版嵁宸插け鏁�");
}
- /**
- * 璋冭捣寮�濮嬪厖鐢垫帴鍙� // TODO
- */
-
return WxPayNotifyResponse.success("鏇存柊鏁版嵁鎴愬姛");
}
@@ -230,10 +250,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);
}
@@ -242,16 +262,19 @@
* 鏍规嵁蹇冭烦鍖呮洿鏂拌鍗曠姸鎬�
*/
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;
+ //鍏呯數涓殑蹇冭烦鍖呴渶瑕佸幓鏇存柊璁㈠崟鏁版嵁锛屽惁鍒欎笉澶勭悊锛�
+ if (dataPackage.getStatusBit().equals("02")) {
+ 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);
}
- //鏇存柊鍏呯數鎬婚噺
- c3mOrder.setActualChargingCapacityHide(Double.parseDouble(dataPackage.getChargedCapacity()));
- //鏇存柊鍓╀綑閲戦
- c3mOrder.setSurplusAmount(Double.parseDouble(dataPackage.getRemainingAmount()));
- updateById(c3mOrder);
}
@@ -272,9 +295,9 @@
/**
* 鑾峰彇鍒涘缓鏃堕棿瓒呰繃10鍒嗛挓鐨勮鍗� 骞朵笖娌℃湁鏀粯鐨勮鍗�
*/
- public void getOrderListByCreateTime() {
+ public void deleteOrderListByCreateTime() {
// 鑾峰彇褰撳墠鏃堕棿鎴�
- long time = new Date().getTime();
+ Long time = System.currentTimeMillis();
//鍒犻櫎瓒呰繃10鍒嗛挓鏈粯娆剧殑璁㈠崟
remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, time).eq(C3mOrder::getOrderStatus, 0));
}
--
Gitblit v1.9.3