From edbb2fe4eabbb7c526fb2f7313bead37d38928e2 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 15 八月 2022 14:57:16 +0800
Subject: [PATCH] 充电桩上电请求
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 71 ++++++++++++++++++++---------------
1 files changed, 41 insertions(+), 30 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 a3c6b01..afe5064 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;
@@ -107,30 +109,20 @@
C3mOrder.setRefundMsg(msg);
if (b) {
C3mOrder.setOrderStatus(OrderStatus.REFUND.getStatus());
- c3mOrderMapper.updateRefundOrder(C3mOrder); // TODO: 閫�娆炬棩蹇�
+ c3mOrderMapper.updateRefundOrder(C3mOrder);
- /* logService.log(
- userId,
- ServerTask.SERVER_TASK,
- "C3m璁㈠崟澶勭悊",
- null,
- "{ 鎿嶄綔鑰�("+username+")" +
- "璁㈠崟閫�娆�: "+C3mOrder.getOutTradeNo()
- +",璁㈠崟鎬婚噾棰�:"+C3mOrder.getTotalAmount()
- +",閫�娆鹃噾棰�: "+C3mOrder.getTotalAmount()+"}");*/
+ log.error("鍏呯數妗╅��娆� " + "{ 鎿嶄綔鑰�(" + username + ")" +
+ "璁㈠崟閫�娆�: " + C3mOrder.getOutTradeNo()
+ + ",璁㈠崟鎬婚噾棰�:" + C3mOrder.getTotalAmount()
+ + ",閫�娆鹃噾棰�: " + C3mOrder.getRefundAmount() + "}");
return true;
} else {
C3mOrder.setOrderStatus(OrderStatus.REFUND_FAILED.getStatus());
c3mOrderMapper.updateRefundOrder(C3mOrder);
- /* logService.log(
- userId,
- ServerTask.SERVER_TASK,
- "C3m璁㈠崟澶勭悊",
- null,
- "{ 鎿嶄綔鑰�("+username+")" +
- "璁㈠崟閫�娆�(澶辫触): "+C3mOrder.getOutTradeNo()
- +",璁㈠崟鎬婚噾棰�:"+C3mOrder.getTotalAmount()
- +",閫�娆鹃噾棰�: "+C3mOrder.getTotalAmount()+"}");*/
+ log.error("鍏呯數妗╅��娆� " + "{ 鎿嶄綔鑰�(" + username + ")" +
+ "璁㈠崟閫�娆�: " + C3mOrder.getOutTradeNo()
+ + ",璁㈠崟鎬婚噾棰�:" + C3mOrder.getTotalAmount()
+ + ",閫�娆鹃噾棰�: " + C3mOrder.getRefundAmount() + "}");
return false;
}
}
@@ -177,12 +169,6 @@
totalAmount,
subscribeChargingCapacity
);
- // 鍔犺浇鍒皉edis缂撳瓨涓�, 鏌ヨ妯″潡鑷姩鏌ヨ鐘舵�佸苟澶勭悊
-// boolean b = redisUtils.set(
-// C3mRedisConstant.C3_NO_PAY_ORDER.getCode() + c3m.getC3Mac() + c3mOrderEntity.getOutTradeNo(),
-// JSON.toJSONString(c3mOrderEntity),
-// C3mRedisConfig.ORDER_MAX_TIME // TODO 娴嬭瘯鏃跺叧闂�
-// );
boolean b = true;
c3mOrderEntity.setOrderId(snowflake.nextId());
c3mOrderEntity.setC3Mac(c3m.getC3Name());
@@ -194,9 +180,6 @@
c3mOrderEntity.setUserCode(wxCode);
c3mOrderEntity.setC3Udid(c3m.getMcuUdid());
-
- // 鎺ㄩ�佸埌鑷姩鏌ヨ妯″潡锛岃繘琛屾壂鎻忓惎鍔�
-// orderQueryListener.startScan(OrderScanType.C3M.getType()); // TODO 娴嬭瘯鏃跺叧闂�
if (b) {
this.save(c3mOrderEntity);
}
@@ -284,10 +267,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;
}
--
Gitblit v1.9.3