From 2e91f5c17fb67d24d16365ea4bc91a8d423ce6a0 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 29 六月 2022 14:05:09 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 165 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 140 insertions(+), 25 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 5ad1e67..c2dee2e 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
@@ -1,32 +1,34 @@
package com.sandu.ximon.admin.service;
-import com.alibaba.fastjson.JSON;
+import cn.hutool.core.lang.Snowflake;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
+import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.ximon.admin.config.C3mRedisConfig;
+import com.sandu.common.util.SpringContextHolder;
+import com.sandu.ximon.admin.manager.iot.frame.inner.report.A5C3HeartbeatReportInnerFrame;
+import com.sandu.ximon.admin.manager.iot.rrpc.enums.C3mRedisConstant;
import com.sandu.ximon.admin.pay.OrderStatusEnums;
import com.sandu.ximon.admin.pay.wx.WxFastPayService;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.security.order.OrderQueryListener;
-import com.sandu.ximon.admin.security.order.OrderScanType;
import com.sandu.ximon.admin.utils.AliPayUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.vo.C3mOrderVO;
+import com.sandu.ximon.dao.bo.C3mOrderBo;
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.enums.C3mRedisConstant;
import com.sandu.ximon.dao.enums.OrderStatus;
import com.sandu.ximon.dao.enums.OrderType;
import com.sandu.ximon.dao.mapper.C3mOrderMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import java.time.LocalDateTime;
import java.util.Date;
import java.util.List;
@@ -44,7 +46,15 @@
private final C3mOrderMapper c3mOrderMapper;
private final WxFastPayService fastPayService;
private final OrderQueryListener orderQueryListener;
+ private final Snowflake snowflake;
+ /**
+ * 閫�娆�
+ *
+ * @param outTradeNo
+ * @param refundAmount
+ * @return
+ */
public boolean orderRefund(String outTradeNo, Double refundAmount/*, Long userId, String username*/) {
Long userId = SecurityUtils.getUserId();
String username = SecurityUtils.getUsername();
@@ -52,17 +62,27 @@
if (orderByOutTradeNo.getTotalAmount() < refundAmount) {
throw new BusinessException("閫�娆鹃噾棰濋敊璇�,涓嶈兘澶т簬浠樻閲戦");
}
- if (null == orderByOutTradeNo) {
- return false;
+ if (orderByOutTradeNo == null) {
+ throw new BusinessException("鏈壘鍒拌鍗�");
} else {
orderByOutTradeNo.setRefundAmount(refundAmount);
- return c3mOrderRefund(orderByOutTradeNo, "椤甸潰API閫�娆�", userId, username);
+ return c3mOrderRefund(orderByOutTradeNo, "鍏呯數妗╅��娆�", userId, username);
}
}
+ /**
+ * 閫�娆�
+ *
+ * @param C3mOrder
+ * @param msg
+ * @param userId
+ * @param username
+ * @return
+ */
+// @Transactional(rollbackFor = Exception.class)
private boolean c3mOrderRefund(C3mOrder C3mOrder, String msg, Long userId, String username) {
// 杩涜閫�娆撅紝璁剧疆璁㈠崟鐘舵�佷负宸查��娆�
boolean b = false;
@@ -111,8 +131,18 @@
}
}
+ /**
+ * 鍒涘缓璁㈠崟
+ *
+ * @param streetlightId
+ * @param c3m
+ * @param orderType
+ * @param totalAmount
+ * @param subscribeChargingCapacity
+ * @return
+ */
public C3mOrder advancePayOrder(Long streetlightId, C3mCharging c3m, String orderType, Double totalAmount,
- Integer subscribeChargingCapacity) {
+ Integer subscribeChargingCapacity, String wxCode) {
// 鍒ゆ柇璇ュ厖鐢垫々鏄惁瀛樺湪姝ｅ湪杩涜涓殑璁㈠崟
String chargingJson = redisUtils.get(C3mRedisConstant.C3_CHARGING_ORDER.getCode() + c3m.getC3Mac());
@@ -133,15 +163,26 @@
subscribeChargingCapacity
);
// 鍔犺浇鍒皉edis缂撳瓨涓�, 鏌ヨ妯″潡鑷姩鏌ヨ鐘舵�佸苟澶勭悊
- boolean b = redisUtils.set(
- C3mRedisConstant.C3_NO_PAY_ORDER.getCode() + c3m.getC3Mac() + c3mOrderEntity.getOutTradeNo(),
- JSON.toJSONString(c3mOrderEntity),
- C3mRedisConfig.ORDER_MAX_TIME
- );
+// 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);
+ c3mOrderEntity.setPoleMac(pole.getDeviceCode());
+ c3mOrderEntity.setPoleName(pole.getPoleName());
+ c3mOrderEntity.setC3Mac(c3m.getC3Mac());
+ c3mOrderEntity.setOrderStatus(0);
+ c3mOrderEntity.setUserCode(wxCode);
+
+
// 鎺ㄩ�佸埌鑷姩鏌ヨ妯″潡锛岃繘琛屾壂鎻忓惎鍔�
- orderQueryListener.startScan(OrderScanType.C3M.getType());
- if(b){
- save(c3mOrderEntity);
+// orderQueryListener.startScan(OrderScanType.C3M.getType()); // TODO 娴嬭瘯鏃跺叧闂�
+ if (b) {
+ this.save(c3mOrderEntity);
}
return b ? c3mOrderEntity : null;
}
@@ -153,6 +194,7 @@
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);
@@ -168,22 +210,95 @@
if (!updateById(userOrder)) {
return WxPayNotifyResponse.fail("鏇存柊鏁版嵁宸插け鏁�");
}
+ /**
+ * 璋冭捣寮�濮嬪厖鐢垫帴鍙� // TODO
+ */
-// UserPayRecord userPayRecord = new UserPayRecord();
-// userPayRecord.setOrderId(userOrder.getId());
-// userPayRecord.setPayAmount(userOrder.getTotalPrice());
-// userPayRecord.setPayType(PayTypeEnums.WECHAT.getCode());
-// userPayRecord.setPayDate(userOrder.getPayTime());
-// userPayRecord.setUserId(userOrder.getUserId());
-// userPayRecordService.save(userPayRecord);
return WxPayNotifyResponse.success("鏇存柊鏁版嵁鎴愬姛");
}
-
+ /**
+ * 璁㈠崟璇︽儏 by orderSn
+ *
+ * @param orderSn
+ * @return
+ */
public C3mOrder getByOrderSn(String orderSn) {
LambdaQueryWrapper<C3mOrder> wrapper = Wrappers.lambdaQuery(C3mOrder.class).eq(C3mOrder::getOutTradeNo, orderSn).last("limit 1");
return getOne(wrapper);
}
+ /**
+ * 鏍规嵁鐏潌id鑾峰彇鏈�杩戜竴鏉¤鍗�
+ */
+ public C3mOrder getLastOrderByPoleId(Long poleId) {
+ LambdaQueryWrapper<C3mOrder> wrapper = Wrappers.lambdaQuery(C3mOrder.class).eq(C3mOrder::getPoleId, poleId).last("limit 1");
+ return getOne(wrapper);
+ }
+
+
+ /**
+ * 鏍规嵁蹇冭烦鍖呮洿鏂拌鍗曠姸鎬�
+ */
+ 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;
+ }
+ //鏇存柊鍏呯數鎬婚噺
+ c3mOrder.setActualChargingCapacityHide(Double.parseDouble(dataPackage.getChargedCapacity()));
+ //鏇存柊鍓╀綑閲戦
+ c3mOrder.setSurplusAmount(Double.parseDouble(dataPackage.getRemainingAmount()));
+ updateById(c3mOrder);
+ }
+
+
+ /**
+ * 璁㈠崟鍒楄〃
+ *
+ * @param baseConditionVO
+ * @return
+ */
+ public List<C3mOrderBo> orderList(BaseConditionVO baseConditionVO) {
+ Long userId = SecurityUtils.getClientId();
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ List<C3mOrderBo> list = baseMapper.orderList(userId);
+ return list;
+ }
+
+
+ /**
+ * 鑾峰彇鍒涘缓鏃堕棿瓒呰繃10鍒嗛挓鐨勮鍗� 骞朵笖娌℃湁鏀粯鐨勮鍗�
+ */
+ public void getOrderListByCreateTime() {
+ // 鑾峰彇褰撳墠鏃堕棿鎴�
+ long time = new Date().getTime();
+ //鍒犻櫎瓒呰繃10鍒嗛挓鏈粯娆剧殑璁㈠崟
+ remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, time).eq(C3mOrder::getOrderStatus, 0));
+ }
+
+ /**
+ * 鎭㈠缁х画鍏呯數
+ *
+ * @param c3Mac
+ * @param mcuUdid
+ */
+ public void recoverContinueCharing(String c3Mac, String mcuUdid) {
+ C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class).
+ eq(C3mOrder::getC3Mac, c3Mac).eq(C3mOrder::getC3Udid, mcuUdid).eq(C3mOrder::getChargingStates, 0).last("limit 1"));
+ if (c3mOrder != null) {
+ c3mOrder.setActualChargingCapacity(c3mOrder.getActualChargingCapacityHide());
+ c3mOrder.setActualChargingCapacityHide(0.00);
+
+ //鍐嶆鍏呯數鐢甸噺
+ double electricity = c3mOrder.getSubscribeChargingCapacity() - c3mOrder.getActualChargingCapacity();
+ Integer chargingCapacity = Integer.valueOf(String.valueOf(Math.floor(electricity)));
+ //鍐嶆鍏呯數閲戦
+ double chargeAmount = c3mOrder.getSurplusAmount();
+ SpringContextHolder.getBean(C3ChargingService.class).startCharging(c3Mac, chargingCapacity, chargeAmount);
+ }
+ }
+
}
--
Gitblit v1.9.3