From 52a3bda95de2e73e5958644f57b2a3d32168a4a1 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 22 八月 2022 16:04:26 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 152 +++++++++++++++++++++++++++++---------------------
1 files changed, 89 insertions(+), 63 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..79c16f1 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,33 +105,24 @@
C3mOrder.getPoleId()
);
}
- C3mOrder.setRefundTimestamp(new Date().getTime());
+ C3mOrder.setRefundTimestamp(System.currentTimeMillis());
C3mOrder.setRefundMsg(msg);
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;
}
}
@@ -147,26 +140,26 @@
@Transactional(rollbackFor = Exception.class)
public C3mOrder advancePayOrder(Long streetlightId, C3mCharging c3m, String orderType, Double totalAmount,
Integer subscribeChargingCapacity, String wxCode) {
-
- // 鍒ゆ柇璇ュ厖鐢垫々鏄惁瀛樺湪姝ｅ湪杩涜涓殑璁㈠崟
- String chargingJson = redisUtils.get(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3m.getC3Mac());
- if (null != chargingJson) {
- throw new BusinessException("璇ュ厖鐢垫々宸插瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�");
- }
//鏌ヨ鍏呯數妗╂槸鍚﹀瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�
C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
- .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getChargingStates, 1).last("limit 1"));
+ .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).last("limit 1"));
+
+ //鍏呯數妗╂鍦ㄥ厖鐢典腑
+ if (c3mOrder != null && c3mOrder.getChargingStates() == 0) {
+ throw new BusinessException("鍏呯數妗╂鍦ㄨ鍗犵敤!");
+ }
+
+ //瀛樺湪璁㈠崟,浣嗘槸鏈敮浠�,闇�瑕佸彇娑堣鍗�
if (c3mOrder != null) {
- throw new BusinessException("璇ュ厖鐢垫々宸插瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�");
+ c3mOrder.setOrderStatus(OrderStatus.CANCEL.getStatus());
+ updateById(c3mOrder);
}
- if (!c3mOrder.getUserCode().equals(wxCode)) {
- throw new BusinessException("璇ュ厖鐢垫々姝ｅ湪琚埆浜轰娇鐢�");
- }
+
Pole pole = poleService.getById(streetlightId);
if (null == pole) {
- return null;
+ throw new BusinessException("鍏呯數妗╃伅鏉嗕俊鎭笉瀛樺湪!");
}
- // 鐢熸垚璁㈠崟锛屽苟鍔犺浇鍒皉edis缂撳瓨锛岃缃秴鏃舵椂闂翠负5鍒嗛挓
+ // 鐢熸垚璁㈠崟
C3mOrder c3mOrderEntity = new C3mOrderVO().generateOrder(
streetlightId,
pole.getDeviceCode(),
@@ -175,13 +168,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());
c3mOrderEntity.setPoleId(streetlightId);
@@ -192,13 +178,15 @@
c3mOrderEntity.setUserCode(wxCode);
c3mOrderEntity.setC3Udid(c3m.getMcuUdid());
+ //
+ c3mOrderEntity.setC3Name("鍒涘缓璁㈠崟");
- // 鎺ㄩ�佸埌鑷姩鏌ヨ妯″潡锛岃繘琛屾壂鎻忓惎鍔�
-// orderQueryListener.startScan(OrderScanType.C3M.getType()); // TODO 娴嬭瘯鏃跺叧闂�
- if (b) {
- this.save(c3mOrderEntity);
+
+ if (save(c3mOrderEntity)) {
+ return c3mOrderEntity;
+ } else {
+ throw new BusinessException("鍒涘缓璁㈠崟澶辫触,璇烽噸鏂版壂鐮�!");
}
- return b ? c3mOrderEntity : null;
}
/**
@@ -208,8 +196,9 @@
WxPayOrderNotifyResult wxPayOrderNotifyResult = fastPayService.parseOrderNotifyResult(xmlData);
String orderSn = wxPayOrderNotifyResult.getOutTradeNo();
String transactionId = wxPayOrderNotifyResult.getOutTradeNo();
- Integer totalFee = wxPayOrderNotifyResult.getTotalFee();
C3mOrder userOrder = getByOrderSn(orderSn);
+ userOrder.setC3Name("鍥炶皟鎴愬姛");
+ updateById(userOrder);
if (userOrder == null) {
return WxPayNotifyResponse.fail("璁㈠崟涓嶅瓨鍦� sn=" + orderSn);
}
@@ -221,15 +210,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 +250,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 +272,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,11 +311,15 @@
/**
* 鑾峰彇鍒涘缓鏃堕棿瓒呰繃10鍒嗛挓鐨勮鍗� 骞朵笖娌℃湁鏀粯鐨勮鍗�
*/
- public void getOrderListByCreateTime() {
+ public void deleteOrderListByCreateTime() {
// 鑾峰彇褰撳墠鏃堕棿鎴�
Long time = System.currentTimeMillis();
+
+ //褰撳墠鏃堕棿鍑忓幓10鍒嗛挓
+ Long timeMinus10 = time - 600000;
+
//鍒犻櫎瓒呰繃10鍒嗛挓鏈粯娆剧殑璁㈠崟
- remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, time).eq(C3mOrder::getOrderStatus, 0));
+ remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, timeMinus10).eq(C3mOrder::getOrderStatus, 0));
}
/**
--
Gitblit v1.9.3