From 65ffc54ad3145eaecbbfe687f7557b95514205a6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 31 八月 2022 17:35:35 +0800
Subject: [PATCH] 充电桩
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 122 ++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 42 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 dacb543..535a29d 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,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
+import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
@@ -55,11 +53,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;
@@ -71,18 +67,18 @@
* @param outTradeNo
* @return
*/
- public boolean orderRefund(String outTradeNo, Double amt) {
+ public boolean orderRefund(String outTradeNo) {
Long userId = SecurityUtils.getUserId();
String username = SecurityUtils.getUsername();
C3mOrder orderByOutTradeNo = c3mOrderMapper.getOrderByOutTradeNo(outTradeNo);
- Double refundAmount = orderByOutTradeNo.getSurplusAmount();
- if (orderByOutTradeNo.getTotalAmount() < refundAmount) {
- throw new BusinessException("閫�娆鹃噾棰濋敊璇�,涓嶈兘澶т簬浠樻閲戦");
- }
+
if (orderByOutTradeNo == null) {
throw new BusinessException("鏈壘鍒拌鍗�");
} else {
- orderByOutTradeNo.setRefundAmount(refundAmount);
+ if (orderByOutTradeNo.getTotalAmount() < orderByOutTradeNo.getRefundAmount()) {
+ throw new BusinessException("閫�娆鹃噾棰濋敊璇�,涓嶈兘澶т簬浠樻閲戦");
+ }
+ orderByOutTradeNo.setRefundAmount(orderByOutTradeNo.getSurplusAmount());
return c3mOrderRefund(orderByOutTradeNo, "鍏呯數妗╅��娆�", userId, username);
}
@@ -110,12 +106,7 @@
C3mOrder.getRefundAmount());
} else if (C3mOrder.getOrderType().equals(OrderType.WXPAY.getCode())) {
// 杩涜寰俊閫�娆�
- b = fastPayService.refund(
- C3mOrder.getTotalAmount(),
- C3mOrder.getRefundAmount(),
- C3mOrder.getOutTradeNo(),
- C3mOrder.getPoleId()
- );
+ b = fastPayService.refund(C3mOrder);
}
C3mOrder.setRefundTimestamp(System.currentTimeMillis());
C3mOrder.setRefundMsg(msg);
@@ -151,10 +142,10 @@
*/
@Transactional(rollbackFor = Exception.class)
public C3mOrder advancePayOrder(Long streetlightId, C3mCharging c3m, String orderType, Double totalAmount,
- Integer subscribeChargingCapacity, String wxCode) {
+ Integer subscribeChargingCapacity, String openId) 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) {
@@ -186,11 +177,45 @@
c3mOrderEntity.setPoleMac(pole.getDeviceCode());
c3mOrderEntity.setPoleName(pole.getPoleName());
c3mOrderEntity.setC3Mac(c3m.getC3Mac());
+ c3mOrderEntity.setC3Name(c3m.getC3Name());
c3mOrderEntity.setOrderStatus(0);
- c3mOrderEntity.setUserCode(wxCode);
+ c3mOrderEntity.setUserCode(openId);
c3mOrderEntity.setC3Udid(c3m.getMcuUdid());
+ 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);
+//
+// //鍚屾璐圭巼
+// System.out.println("鍚屾璐圭巼寮�濮�");
+// 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;
@@ -260,6 +285,7 @@
}
//寮�鍚厖鐢垫垚鍔熷悗锛屾洿鏂拌鍗曠姸鎬佷负鍏呯數涓�
userOrder.setChargingStates(0);
+ userOrder.setStartChargingTimestamp(System.currentTimeMillis());
log.error("[-----------------寰俊鏀粯鍥炶皟缁撴潫-----------------]");
if (!updateById(userOrder)) {
return WxPayNotifyResponse.fail("鏇存柊鏁版嵁宸插け鏁�");
@@ -365,25 +391,37 @@
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);
+ /**
+ * 鍏呯數妗╂晠闅滄儏鍐典笅,缁撴潫鏁呴殰鍓嶆鍦ㄨ繘琛屼腑鐨勮鍗�
+ *
+ * @param dataPackage
+ */
+ public void stopCharingOrder(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
+ if (dataPackage == null) {
+ return;
+ }
+ //鑾峰彇姝ｅ湪杩涜涓殑璁㈠崟
+ C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
+ .eq(C3mOrder::getC3Mac, dataPackage.getC3Mac()).eq(C3mOrder::getChargingStates, 0)
+ .eq(C3mOrder::getOrderStatus, OrderStatus.PAYED.getStatus()).last("limit 1"));
+ //璁㈠崟鏈粨鏉�,浣嗘槸鍏呯數妗╀负绌洪棽鐘舵��(鍗冲厖鐢垫々鏂數/鏁呴殰鎯呭喌) 缁撴潫璇ヨ鍗�
+ if ("1".equals(dataPackage.getStatusBit()) && c3mOrder != null) {
+ //璁剧疆璁㈠崟涓哄凡瀹屾垚
+ c3mOrder.setOrderStatus(OrderStatus.COMPLETE.getStatus());
+ //璁剧疆鍏呯數鐘舵�佷负宸茬粨鏉�
+ c3mOrder.setChargingStates(1);
+ //璁剧疆鍏呯數鐢甸噺
+ c3mOrder.setActualChargingCapacity(Double.parseDouble(dataPackage.getChargedCapacity()));
+ //璁剧疆閫�娆鹃噾棰�
+ c3mOrder.setRefundAmount(Double.parseDouble(dataPackage.getRemainingAmount()));
+ //璁剧疆鍓╀綑閲戦
+ c3mOrder.setSurplusAmount(Double.parseDouble(dataPackage.getRemainingAmount()));
+ //缁撴潫鍏呯數(璁㈠崟)鏃堕棿
+ c3mOrder.setStopChargingTimestamp(System.currentTimeMillis());
+ //鍏呯數鏃堕暱
+ c3mOrder.setAlreadyChargingTime(dataPackage.getAlreadyChargingTime());
+ updateById(c3mOrder);
}
}
--
Gitblit v1.9.3