From c78889bffa820ff599d3d524800c20b477074326 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 24 八月 2022 14:41:18 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3mOrderService.java | 82 ++++++++++++++++++++++++++++++----------
1 files changed, 61 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 79c16f1..b5771e6 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;
/**
* 閫�娆�
@@ -59,18 +71,18 @@
* @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("鏈壘鍒拌鍗�");
} else {
- orderByOutTradeNo.setRefundAmount(refundAmount);
+ if (orderByOutTradeNo.getTotalAmount() < orderByOutTradeNo.getRefundAmount()) {
+ throw new BusinessException("閫�娆鹃噾棰濋敊璇�,涓嶈兘澶т簬浠樻閲戦");
+ }
+ orderByOutTradeNo.setRefundAmount(orderByOutTradeNo.getSurplusAmount());
return c3mOrderRefund(orderByOutTradeNo, "鍏呯數妗╅��娆�", userId, username);
}
@@ -98,12 +110,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);
@@ -145,7 +152,7 @@
.eq(C3mOrder::getC3Udid, c3m.getMcuUdid()).last("limit 1"));
//鍏呯數妗╂鍦ㄥ厖鐢典腑
- if (c3mOrder != null && c3mOrder.getChargingStates() == 0) {
+ if (c3mOrder != null && c3mOrder.getChargingStates() != null && c3mOrder.getChargingStates() == 0) {
throw new BusinessException("鍏呯數妗╂鍦ㄨ鍗犵敤!");
}
@@ -177,9 +184,8 @@
c3mOrderEntity.setOrderStatus(0);
c3mOrderEntity.setUserCode(wxCode);
c3mOrderEntity.setC3Udid(c3m.getMcuUdid());
-
- //
- c3mOrderEntity.setC3Name("鍒涘缓璁㈠崟");
+ c3mOrderEntity.setRefundAmount(totalAmount);
+ c3mOrderEntity.setSurplusAmount(totalAmount);
if (save(c3mOrderEntity)) {
@@ -189,15 +195,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,10 +251,13 @@
*/
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("鏇存柊鏁版嵁宸插け鏁�");
}
@@ -226,6 +265,7 @@
return WxPayNotifyResponse.success("鏇存柊鏁版嵁鎴愬姛");
}
+
/**
* 璁㈠崟璇︽儏 by orderSn
*
--
Gitblit v1.9.3