From 72046386cf8a85ad7dae79d82485fa60c2c421e6 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期二, 05 七月 2022 18:25:12 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 84 ++++++++++++++++++++++++++++++------------
1 files changed, 60 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 ecc51d0..a77cb19 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
@@ -30,6 +30,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
import java.util.Date;
import java.util.List;
@@ -55,13 +57,13 @@
* 閫�娆�
*
* @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("閫�娆鹃噾棰濋敊璇�,涓嶈兘澶т簬浠樻閲戦");
}
@@ -103,11 +105,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,
@@ -155,12 +158,13 @@
}
//鏌ヨ鍏呯數妗╂槸鍚﹀瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�
C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
- .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getChargingStates, 1).last("limit 1"));
+ .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("璇ュ厖鐢垫々宸插瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�");
- }
- if (!c3mOrder.getUserCode().equals(wxCode)) {
- throw new BusinessException("璇ュ厖鐢垫々姝ｅ湪琚埆浜轰娇鐢�");
}
Pole pole = poleService.getById(streetlightId);
if (null == pole) {
@@ -208,7 +212,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);
@@ -221,15 +224,17 @@
userOrder.setOutTradeNo(transactionId);
userOrder.setPayTimestamp(new Date().getTime());
userOrder.setOrderStatus(OrderStatusEnums.PAID.getCode());
- if (!updateById(userOrder)) {
- return WxPayNotifyResponse.fail("鏇存柊鏁版嵁宸插け鏁�");
- }
/**
* 璋冭捣寮�濮嬪厖鐢垫帴鍙�
*/
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("鏇存柊鏁版嵁宸插け鏁�");
}
return WxPayNotifyResponse.success("鏇存柊鏁版嵁鎴愬姛");
@@ -259,16 +264,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);
}
@@ -278,10 +286,38 @@
* @param baseConditionVO
* @return
*/
- public List<C3mOrderBo> orderList(BaseConditionVO baseConditionVO) {
+ public List<C3mOrderBo> orderList(BaseConditionVO baseConditionVO, String keyword,
+ Integer orderStatus, Integer timeType) {
+ if (orderStatus != null && (orderStatus > 5 || orderStatus < 0)) {
+ throw new BusinessException("璁㈠崟鐘舵�佷笉姝ｇ‘");
+ }
Long userId = SecurityUtils.getClientId();
+ //鏌ヨ杩戜竴涓湀鐨勮鍗�
+ LocalDateTime now = LocalDateTime.now();
+ LocalDateTime startTime = null;
+ ;
+ Long startTimeStamp = null;
+ Long nowTimeStamp = null;
+ if (timeType != null) {
+ if (timeType == 1) {
+ //鏌ヨ杩戜竴涓湀鐨勮鍗�
+ startTime = now.minusMonths(1);
+ } else if (timeType == 2) {
+ //鏌ヨ杩戜笁涓湀鐨勮鍗�
+ startTime = now.minusMonths(3);
+ } else if (timeType == 3) {
+ //鏌ヨ杩戝崐骞寸殑璁㈠崟
+ startTime = now.minusMonths(6);
+ } else {
+ throw new BusinessException("鏃堕棿绫诲瀷涓嶆纭�");
+ }
+ //startTime杞崲涓烘椂闂存埑
+ startTimeStamp = startTime.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+ //endTime杞崲涓烘椂闂存埑
+ nowTimeStamp = now.atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+ }
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- List<C3mOrderBo> list = baseMapper.orderList(userId);
+ List<C3mOrderBo> list = baseMapper.orderList(userId, keyword, orderStatus, startTimeStamp, nowTimeStamp);
return list;
}
@@ -289,7 +325,7 @@
/**
* 鑾峰彇鍒涘缓鏃堕棿瓒呰繃10鍒嗛挓鐨勮鍗� 骞朵笖娌℃湁鏀粯鐨勮鍗�
*/
- public void getOrderListByCreateTime() {
+ public void deleteOrderListByCreateTime() {
// 鑾峰彇褰撳墠鏃堕棿鎴�
Long time = System.currentTimeMillis();
//鍒犻櫎瓒呰繃10鍒嗛挓鏈粯娆剧殑璁㈠崟
--
Gitblit v1.9.3