From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 103 ++++++++++++++++++++++++++++-----------------------
1 files changed, 57 insertions(+), 46 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 8f16fd1..247bf62 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
@@ -14,8 +14,6 @@
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.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;
@@ -24,7 +22,10 @@
import com.sandu.ximon.admin.utils.AliPayUtils;
import com.sandu.ximon.admin.vo.C3mOrderVO;
import com.sandu.ximon.dao.bo.C3mOrderBo;
-import com.sandu.ximon.dao.domain.*;
+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.enums.OrderStatus;
import com.sandu.ximon.dao.enums.OrderType;
import com.sandu.ximon.dao.mapper.C3mOrderMapper;
@@ -36,7 +37,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
@@ -71,6 +71,15 @@
String username = SecurityUtils.getUsername();
C3mOrder orderByOutTradeNo = c3mOrderMapper.getOrderByOutTradeNo(outTradeNo);
+ if(orderByOutTradeNo==null){
+ throw new BusinessException("鏈壘鍒拌鍗�!");
+ }
+ //閫�娆惧墠杩涜鐘舵�佸垽鏂�
+ if (orderByOutTradeNo.getOrderStatus().equals(OrderStatus.REFUND.getStatus())
+ || orderByOutTradeNo.getOrderStatus().equals(OrderStatus.CANCEL.getStatus())
+ || orderByOutTradeNo.getOrderStatus().equals(OrderStatus.NO_PAY.getStatus())) {
+ throw new BusinessException("璁㈠崟鐘舵�侀敊璇�,鏃犳硶閫�娆� !");
+ }
if (orderByOutTradeNo == null) {
throw new BusinessException("鏈壘鍒拌鍗�");
} else {
@@ -141,7 +150,7 @@
*/
@Transactional(rollbackFor = Exception.class)
public C3mOrder advancePayOrder(Long streetlightId, C3mCharging c3m, String orderType, Double totalAmount,
- Integer subscribeChargingCapacity, String wxCode) throws InterruptedException {
+ Integer subscribeChargingCapacity, String openId) throws InterruptedException {
//鏌ヨ鍏呯數妗╂槸鍚﹀瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�
C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
.eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getC3Mac, c3m.getC3Mac()).last("limit 1"));
@@ -151,11 +160,11 @@
throw new BusinessException("鍏呯數妗╂鍦ㄨ鍗犵敤!");
}
- //瀛樺湪璁㈠崟,浣嗘槸鏈敮浠�,闇�瑕佸彇娑堣鍗�
- if (c3mOrder != null) {
- c3mOrder.setOrderStatus(OrderStatus.CANCEL.getStatus());
- updateById(c3mOrder);
- }
+// //瀛樺湪璁㈠崟,浣嗘槸鏈敮浠�,闇�瑕佸彇娑堣鍗�
+// if (c3mOrder != null) {
+// c3mOrder.setOrderStatus(OrderStatus.CANCEL.getStatus());
+// updateById(c3mOrder);
+// }
Pole pole = poleService.getById(streetlightId);
if (null == pole) {
@@ -176,43 +185,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);
-
- //鍚屾璐圭巼
- 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 + "!");
- }
+// //纭鍏呯數妗╃姸鎬�
+// 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;
@@ -390,17 +401,17 @@
/**
- * 鍏呯數妗╂晠闅滄儏鍐典笅,缁撴灉鏁呴殰鍓嶆鍦ㄨ繘琛屼腑鐨勮鍗�
+ * 鍏呯數妗╂晠闅滄儏鍐典笅,缁撴潫鏁呴殰鍓嶆鍦ㄨ繘琛屼腑鐨勮鍗�
*
* @param dataPackage
*/
- public void stopCharingOrder(String c3Mac, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
- if (c3Mac.isEmpty() || c3Mac == null || dataPackage == null) {
+ public void stopCharingOrder(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
+ if (dataPackage == null) {
return;
}
//鑾峰彇姝ｅ湪杩涜涓殑璁㈠崟
C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
- .eq(C3mOrder::getC3Mac, c3Mac).eq(C3mOrder::getChargingStates, 0)
+ .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) {
--
Gitblit v1.9.3