From 3075910e10bb60fa2775afb4dbad8d5dba488abb Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 七月 2022 09:56:36 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 81 ++++++++++++++++++++++++----------------
1 files changed, 48 insertions(+), 33 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 4244faf..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;
@@ -57,11 +59,11 @@
* @param outTradeNo
* @return
*/
- public boolean orderRefund(String outTradeNo,Double amt) {
+ public boolean orderRefund(String outTradeNo, Double amt) {
Long userId = SecurityUtils.getUserId();
String username = SecurityUtils.getUsername();
C3mOrder orderByOutTradeNo = c3mOrderMapper.getOrderByOutTradeNo(outTradeNo);
- Double refundAmount=orderByOutTradeNo.getSurplusAmount();
+ Double refundAmount = orderByOutTradeNo.getSurplusAmount();
if (orderByOutTradeNo.getTotalAmount() < refundAmount) {
throw new BusinessException("閫�娆鹃噾棰濋敊璇�,涓嶈兘澶т簬浠樻閲戦");
}
@@ -108,28 +110,19 @@
if (b) {
C3mOrder.setOrderStatus(OrderStatus.REFUND.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 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;
}
}
@@ -155,10 +148,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("璇ュ厖鐢垫々宸插瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�");
}
Pole pole = poleService.getById(streetlightId);
if (null == pole) {
@@ -173,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());
@@ -190,9 +180,6 @@
c3mOrderEntity.setUserCode(wxCode);
c3mOrderEntity.setC3Udid(c3m.getMcuUdid());
-
- // 鎺ㄩ�佸埌鑷姩鏌ヨ妯″潡锛岃繘琛屾壂鎻忓惎鍔�
-// orderQueryListener.startScan(OrderScanType.C3M.getType()); // TODO 娴嬭瘯鏃跺叧闂�
if (b) {
this.save(c3mOrderEntity);
}
@@ -259,7 +246,7 @@
*/
public void updateOrderStatusByHeartbeat(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
//鍏呯數涓殑蹇冭烦鍖呴渶瑕佸幓鏇存柊璁㈠崟鏁版嵁锛屽惁鍒欎笉澶勭悊锛�
- if(dataPackage.getStatusBit().equals("02")){
+ 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) {
@@ -280,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