From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 191 +++++++++++++++++++++++++++++++++++------------
1 files changed, 140 insertions(+), 51 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 79c16f1..247bf62 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,39 +1,47 @@
package com.sandu.ximon.admin.service;
import cn.hutool.core.lang.Snowflake;
+import cn.hutool.core.util.XmlUtil;
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.binarywang.wxpay.config.WxPayConfig;
+import com.github.binarywang.wxpay.constant.WxPayConstants;
+import com.github.binarywang.wxpay.service.WxPayService;
+import com.github.binarywang.wxpay.service.impl.WxPayServiceImpl;
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.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.pay.wxpay.UsrWxPayConfigService;
import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.admin.security.order.OrderQueryListener;
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.domain.WxConfigEntity;
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.apache.commons.io.IOUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.Date;
import java.util.List;
+import java.util.Map;
/**
* @Author liuhaonan
@@ -44,14 +52,13 @@
@AllArgsConstructor
public class C3mOrderService extends BaseServiceImpl<C3mOrderMapper, C3mOrder> {
- private final RedisUtils redisUtils;
private final PoleService poleService;
private final C3mOrderMapper c3mOrderMapper;
private final WxFastPayService fastPayService;
- private final OrderQueryListener orderQueryListener;
private final Snowflake snowflake;
private final C3ChargingService c3ChargingService;
+ private final UsrWxPayConfigService usrWxPayConfigService;
/**
* 閫�娆�
@@ -59,18 +66,27 @@
* @param outTradeNo
* @return
*/
- public boolean orderRefund(String outTradeNo, Double amt) {
+ public boolean orderRefund(String outTradeNo) {
Long userId = SecurityUtils.getUserId();
String username = SecurityUtils.getUsername();
C3mOrder orderByOutTradeNo = c3mOrderMapper.getOrderByOutTradeNo(outTradeNo);
- Double refundAmount = orderByOutTradeNo.getSurplusAmount();
- if (orderByOutTradeNo.getTotalAmount() < refundAmount) {
- throw new BusinessException("閫�娆鹃噾棰濋敊璇�,涓嶈兘澶т簬浠樻閲戦");
+
+ if(orderByOutTradeNo==null){
+ throw new BusinessException("鏈壘鍒拌鍗�!");
+ }
+ //閫�娆惧墠杩涜鐘舵�佸垽鏂�
+ if (orderByOutTradeNo.getOrderStatus().equals(OrderStatus.REFUND.getStatus())
+ || orderByOutTradeNo.getOrderStatus().equals(OrderStatus.CANCEL.getStatus())
+ || orderByOutTradeNo.getOrderStatus().equals(OrderStatus.NO_PAY.getStatus())) {
+ throw new BusinessException("璁㈠崟鐘舵�侀敊璇�,鏃犳硶閫�娆� !");
}
if (orderByOutTradeNo == null) {
throw new BusinessException("鏈壘鍒拌鍗�");
} else {
- orderByOutTradeNo.setRefundAmount(refundAmount);
+ if (orderByOutTradeNo.getTotalAmount() < orderByOutTradeNo.getRefundAmount()) {
+ throw new BusinessException("閫�娆鹃噾棰濋敊璇�,涓嶈兘澶т簬浠樻閲戦");
+ }
+ orderByOutTradeNo.setRefundAmount(orderByOutTradeNo.getSurplusAmount());
return c3mOrderRefund(orderByOutTradeNo, "鍏呯數妗╅��娆�", userId, username);
}
@@ -98,12 +114,7 @@
C3mOrder.getRefundAmount());
} else if (C3mOrder.getOrderType().equals(OrderType.WXPAY.getCode())) {
// 杩涜寰俊閫�娆�
- b = fastPayService.refund(
- C3mOrder.getTotalAmount(),
- C3mOrder.getRefundAmount(),
- C3mOrder.getOutTradeNo(),
- C3mOrder.getPoleId()
- );
+ b = fastPayService.refund(C3mOrder);
}
C3mOrder.setRefundTimestamp(System.currentTimeMillis());
C3mOrder.setRefundMsg(msg);
@@ -139,21 +150,21 @@
*/
@Transactional(rollbackFor = Exception.class)
public C3mOrder advancePayOrder(Long streetlightId, C3mCharging c3m, String orderType, Double totalAmount,
- Integer subscribeChargingCapacity, String wxCode) {
+ Integer subscribeChargingCapacity, String openId) throws InterruptedException {
//鏌ヨ鍏呯數妗╂槸鍚﹀瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�
C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
- .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).last("limit 1"));
+ .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).eq(C3mOrder::getC3Mac, c3m.getC3Mac()).last("limit 1"));
//鍏呯數妗╂鍦ㄥ厖鐢典腑
- if (c3mOrder != null && c3mOrder.getChargingStates() == 0) {
+ if (c3mOrder != null && c3mOrder.getChargingStates() != null && c3mOrder.getChargingStates() == 0) {
throw new BusinessException("鍏呯數妗╂鍦ㄨ鍗犵敤!");
}
- //瀛樺湪璁㈠崟,浣嗘槸鏈敮浠�,闇�瑕佸彇娑堣鍗�
- if (c3mOrder != null) {
- c3mOrder.setOrderStatus(OrderStatus.CANCEL.getStatus());
- updateById(c3mOrder);
- }
+// //瀛樺湪璁㈠崟,浣嗘槸鏈敮浠�,闇�瑕佸彇娑堣鍗�
+// if (c3mOrder != null) {
+// c3mOrder.setOrderStatus(OrderStatus.CANCEL.getStatus());
+// updateById(c3mOrder);
+// }
Pole pole = poleService.getById(streetlightId);
if (null == pole) {
@@ -174,13 +185,45 @@
c3mOrderEntity.setPoleMac(pole.getDeviceCode());
c3mOrderEntity.setPoleName(pole.getPoleName());
c3mOrderEntity.setC3Mac(c3m.getC3Mac());
+ c3mOrderEntity.setC3Name(c3m.getC3Name());
c3mOrderEntity.setOrderStatus(0);
- c3mOrderEntity.setUserCode(wxCode);
+ c3mOrderEntity.setUserCode(openId);
c3mOrderEntity.setC3Udid(c3m.getMcuUdid());
+ c3mOrderEntity.setRefundAmount(totalAmount);
+ c3mOrderEntity.setSurplusAmount(totalAmount);
- //
- c3mOrderEntity.setC3Name("鍒涘缓璁㈠崟");
-
+// //纭鍏呯數妗╃姸鎬�
+// ChargingDto chargingInfo = c3ChargingService.getChargingInfo(streetlightId.toString());
+// if (chargingInfo.getStatusBit() != 1) {
+// throw new BusinessException("鍏呯數妗╅潪绌洪棽鐘舵��,鏃犳硶鍒涘缓璁㈠崟!");
+// }
+// Thread.sleep(500);
+//
+// //鍚屾鏃堕棿鎴�
+// System.out.println("鍚屾鏃堕棿鎴冲紑濮�");
+// String date = new SimpleDateFormat("yyMMddHHmmss").format(new Date());
+// String s = c3ChargingService.SetCalendar(c3m.getC3Mac(), Integer.parseInt(date.substring(0, 2)), Integer.parseInt(date.substring(2, 4)),
+// Integer.parseInt(date.substring(4, 6)), Integer.parseInt(date.substring(6, 8)),
+// Integer.parseInt(date.substring(8, 10)), Integer.parseInt(date.substring(10, 12)), true);
+// log.error("鍚屾鏃堕棿鎴崇粨鏋� : " + s);
+// if (!"鎿嶄綔鎴愬姛".equals(s)) {
+// throw new BusinessException(s + "!");
+// }
+// Thread.sleep(500);
+//
+// //鍚屾璐圭巼
+// System.out.println("鍚屾璐圭巼寮�濮�");
+// List<C3mChargingCharge> list = SpringContextHolder.getBean(C3mChargingChargeService.class)
+// .list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, c3m.getC3Id()));
+// if (list == null && list.size() == 0) {
+// //璐圭巼琛ㄤ腑娌℃湁姝ゅ厖鐢垫々鏁版嵁鏃� 娣诲姞榛樿璐圭巼
+// SpringContextHolder.getBean(C3mChargingChargeService.class).initCharge((c3m.getC3Id()).intValue());
+// }
+// String rateState = c3ChargingService.setRate(c3m.getC3Mac(), list, true);
+// log.error("璐圭巼璁剧疆缁撴灉 : " + rateState);
+// if (!"鎿嶄綔鎴愬姛".equals(rateState)) {
+// throw new BusinessException(s + "!");
+// }
if (save(c3mOrderEntity)) {
return c3mOrderEntity;
@@ -189,15 +232,45 @@
}
}
+
/**
- * 寰俊鏀粯鍥炶皟
+ * 寰俊鏀粯鍥炶皟 灏忕▼搴�
*/
- public Object payWechatNotify(String xmlData) {
- WxPayOrderNotifyResult wxPayOrderNotifyResult = fastPayService.parseOrderNotifyResult(xmlData);
+ public Object payOrderInstoreNotify(HttpServletRequest request, HttpServletResponse httpResponse) {
+ log.error("[-----------------寰俊鏀粯鍥炶皟寮�濮�-----------------]");
+ String xmlResult = null;
+ try {
+ xmlResult = IOUtils.toString(request.getInputStream(), request.getCharacterEncoding());
+ } catch (IOException e) {
+ throw new BusinessException(e.getMessage());
+ }
+ log.error("request: " + xmlResult);
+
+ if (xmlResult == null) {
+ return null;
+ }
+ Map<String, Object> stringObjectMap = XmlUtil.xmlToMap(xmlResult);
+ String appId = (String) stringObjectMap.get("appid");
+ WxConfigEntity configByAppId = usrWxPayConfigService.getConfigByAppId(appId);
+ WxPayConfig config = new WxPayConfig();
+ config.setAppId(configByAppId.getAppappid());
+ config.setMchId(configByAppId.getMchId());
+ config.setMchKey(configByAppId.getPrivateKey());
+
+ WxPayService wxPayService = new WxPayServiceImpl();
+ wxPayService.setConfig(config);
+
+
+ WxPayOrderNotifyResult wxPayOrderNotifyResult = fastPayService.parseOrderNotifyResult(wxPayService, xmlResult);
+ if (!WxPayConstants.ResultCode.SUCCESS.equals(wxPayOrderNotifyResult.getResultCode())
+ || !WxPayConstants.ResultCode.SUCCESS.equals(wxPayOrderNotifyResult.getReturnCode())) {
+ log.error(xmlResult);
+ return WxPayNotifyResponse.fail("寰俊閫氱煡鏀粯澶辫触锛�");
+ }
+
String orderSn = wxPayOrderNotifyResult.getOutTradeNo();
String transactionId = wxPayOrderNotifyResult.getOutTradeNo();
C3mOrder userOrder = getByOrderSn(orderSn);
- userOrder.setC3Name("鍥炶皟鎴愬姛");
updateById(userOrder);
if (userOrder == null) {
return WxPayNotifyResponse.fail("璁㈠崟涓嶅瓨鍦� sn=" + orderSn);
@@ -215,16 +288,20 @@
*/
String s = c3ChargingService.startCharging(userOrder.getC3Mac(), userOrder.getSubscribeChargingCapacity(), userOrder.getTotalAmount());
if (s.isEmpty() || s == null) {
+ log.error("[-----------------寮�鍚厖鐢靛け璐�-----------------]");
throw new BusinessException("寮�鍚厖鐢靛け璐�");
}
//寮�鍚厖鐢垫垚鍔熷悗锛屾洿鏂拌鍗曠姸鎬佷负鍏呯數涓�
userOrder.setChargingStates(0);
+ userOrder.setStartChargingTimestamp(System.currentTimeMillis());
+ log.error("[-----------------寰俊鏀粯鍥炶皟缁撴潫-----------------]");
if (!updateById(userOrder)) {
return WxPayNotifyResponse.fail("鏇存柊鏁版嵁宸插け鏁�");
}
return WxPayNotifyResponse.success("鏇存柊鏁版嵁鎴愬姛");
}
+
/**
* 璁㈠崟璇︽儏 by orderSn
@@ -322,25 +399,37 @@
remove(Wrappers.lambdaQuery(C3mOrder.class).lt(C3mOrder::getCreateTimestamp, timeMinus10).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);
+ /**
+ * 鍏呯數妗╂晠闅滄儏鍐典笅,缁撴潫鏁呴殰鍓嶆鍦ㄨ繘琛屼腑鐨勮鍗�
+ *
+ * @param dataPackage
+ */
+ public void stopCharingOrder(A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage dataPackage) {
+ if (dataPackage == null) {
+ return;
+ }
+ //鑾峰彇姝ｅ湪杩涜涓殑璁㈠崟
+ C3mOrder c3mOrder = getOne(Wrappers.lambdaQuery(C3mOrder.class)
+ .eq(C3mOrder::getC3Mac, dataPackage.getC3Mac()).eq(C3mOrder::getChargingStates, 0)
+ .eq(C3mOrder::getOrderStatus, OrderStatus.PAYED.getStatus()).last("limit 1"));
+ //璁㈠崟鏈粨鏉�,浣嗘槸鍏呯數妗╀负绌洪棽鐘舵��(鍗冲厖鐢垫々鏂數/鏁呴殰鎯呭喌) 缁撴潫璇ヨ鍗�
+ if ("1".equals(dataPackage.getStatusBit()) && c3mOrder != null) {
+ //璁剧疆璁㈠崟涓哄凡瀹屾垚
+ c3mOrder.setOrderStatus(OrderStatus.COMPLETE.getStatus());
+ //璁剧疆鍏呯數鐘舵�佷负宸茬粨鏉�
+ c3mOrder.setChargingStates(1);
+ //璁剧疆鍏呯數鐢甸噺
+ c3mOrder.setActualChargingCapacity(Double.parseDouble(dataPackage.getChargedCapacity()));
+ //璁剧疆閫�娆鹃噾棰�
+ c3mOrder.setRefundAmount(Double.parseDouble(dataPackage.getRemainingAmount()));
+ //璁剧疆鍓╀綑閲戦
+ c3mOrder.setSurplusAmount(Double.parseDouble(dataPackage.getRemainingAmount()));
+ //缁撴潫鍏呯數(璁㈠崟)鏃堕棿
+ c3mOrder.setStopChargingTimestamp(System.currentTimeMillis());
+ //鍏呯數鏃堕暱
+ c3mOrder.setAlreadyChargingTime(dataPackage.getAlreadyChargingTime());
+ updateById(c3mOrder);
}
}
--
Gitblit v1.9.3