From 694962918618b6d9531d8ca876a6746e030387f1 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 23 八月 2022 11:38:26 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 94 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 73 insertions(+), 21 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 afe5064..dacb543 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,19 +1,24 @@
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;
@@ -23,17 +28,23 @@
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
@@ -52,6 +63,7 @@
private final Snowflake snowflake;
private final C3ChargingService c3ChargingService;
+ private final UsrWxPayConfigService usrWxPayConfigService;
/**
* 閫�娆�
@@ -140,27 +152,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, 0).last("limit 1"));
+ .eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).last("limit 1"));
- if (c3mOrder != null && !c3mOrder.getUserCode().equals(wxCode)) {
- throw new BusinessException("璇ュ厖鐢垫々姝ｅ湪琚埆浜轰娇鐢�");
+ //鍏呯數妗╂鍦ㄥ厖鐢典腑
+ if (c3mOrder != null && c3mOrder.getChargingStates() != null && c3mOrder.getChargingStates() == 0) {
+ throw new BusinessException("鍏呯數妗╂鍦ㄨ鍗犵敤!");
}
+
+ //瀛樺湪璁㈠崟,浣嗘槸鏈敮浠�,闇�瑕佸彇娑堣鍗�
if (c3mOrder != null) {
- throw new BusinessException("璇ュ厖鐢垫々宸插瓨鍦ㄦ鍦ㄨ繘琛屼腑鐨勮鍗�");
+ c3mOrder.setOrderStatus(OrderStatus.CANCEL.getStatus());
+ updateById(c3mOrder);
}
+
Pole pole = poleService.getById(streetlightId);
if (null == pole) {
- return null;
+ throw new BusinessException("鍏呯數妗╃伅鏉嗕俊鎭笉瀛樺湪!");
}
- // 鐢熸垚璁㈠崟锛屽苟鍔犺浇鍒皉edis缂撳瓨锛岃缃秴鏃舵椂闂翠负5鍒嗛挓
+ // 鐢熸垚璁㈠崟
C3mOrder c3mOrderEntity = new C3mOrderVO().generateOrder(
streetlightId,
pole.getDeviceCode(),
@@ -169,7 +180,6 @@
totalAmount,
subscribeChargingCapacity
);
- boolean b = true;
c3mOrderEntity.setOrderId(snowflake.nextId());
c3mOrderEntity.setC3Mac(c3m.getC3Name());
c3mOrderEntity.setPoleId(streetlightId);
@@ -180,20 +190,55 @@
c3mOrderEntity.setUserCode(wxCode);
c3mOrderEntity.setC3Udid(c3m.getMcuUdid());
- if (b) {
- this.save(c3mOrderEntity);
+
+
+ if (save(c3mOrderEntity)) {
+ return c3mOrderEntity;
+ } else {
+ throw new BusinessException("鍒涘缓璁㈠崟澶辫触,璇烽噸鏂版壂鐮�!");
}
- return b ? c3mOrderEntity : null;
}
+
/**
- * 寰俊鏀粯鍥炶皟
+ * 寰俊鏀粯鍥炶皟 灏忕▼搴�
*/
- 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);
+ updateById(userOrder);
if (userOrder == null) {
return WxPayNotifyResponse.fail("璁㈠崟涓嶅瓨鍦� sn=" + orderSn);
}
@@ -210,16 +255,19 @@
*/
String s = c3ChargingService.startCharging(userOrder.getC3Mac(), userOrder.getSubscribeChargingCapacity(), userOrder.getTotalAmount());
if (s.isEmpty() || s == null) {
+ log.error("[-----------------寮�鍚厖鐢靛け璐�-----------------]");
throw new BusinessException("寮�鍚厖鐢靛け璐�");
}
//寮�鍚厖鐢垫垚鍔熷悗锛屾洿鏂拌鍗曠姸鎬佷负鍏呯數涓�
userOrder.setChargingStates(0);
+ log.error("[-----------------寰俊鏀粯鍥炶皟缁撴潫-----------------]");
if (!updateById(userOrder)) {
return WxPayNotifyResponse.fail("鏇存柊鏁版嵁宸插け鏁�");
}
return WxPayNotifyResponse.success("鏇存柊鏁版嵁鎴愬姛");
}
+
/**
* 璁㈠崟璇︽儏 by orderSn
@@ -309,8 +357,12 @@
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