From 8235bb3cebd773ba6fe29719cba7706858bbc2ee Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 01 四月 2022 14:20:09 +0800
Subject: [PATCH] 订单
---
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java
index 27346f7..84e9cec 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java
@@ -15,8 +15,7 @@
import com.github.binarywang.wxpay.service.WxPayService;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.util.IpUtil;
-import com.sandu.ximon.admin.dto.YSY_AccessTokenDto;
-import com.sandu.ximon.admin.dto.wxquery.WxOrderDto;
+import com.sandu.ximon.admin.dto.wxquerydto.WxOrderDto;
import com.sandu.ximon.admin.pay.wxpay.UsrWxPayConfigService;
import com.sandu.ximon.dao.domain.WxConfigEntity;
import lombok.AllArgsConstructor;
@@ -128,15 +127,18 @@
* @param outTradeNo
* @return
*/
- private Object WxOrderQuery(Long poleId,String outTradeNo){
+ public boolean WxOrderQuery(Long poleId,String outTradeNo){
WxConfigEntity wxConfig = wxPayConfigService.getConfigByPoleId(poleId);
if(wxConfig==null){
throw new BusinessException("鑾峰彇寰俊鏀粯閰嶇疆澶辫触");
}
String s = HttpUtil.get(WECHAT_ORDER_QUETY_URL + outTradeNo + WECHAT_ORDER_QUETY + wxConfig.getMchId());//WxOrderDto
WxOrderDto wxOrderDto = JSON.parseObject(s, WxOrderDto.class);
+ if(("SUCCESS").equals(wxOrderDto.getTrade_state())){
+ return true;
+ }
- return wxOrderDto.getTrade_state();
+ return false;
}
/**
@@ -162,7 +164,7 @@
return sign;
}
- public WxPayOrderNotifyResult parseOrderNotifyResult(WxPayService wxPayService, String xmlData) {
+ public WxPayOrderNotifyResult parseOrderNotifyResult(String xmlData) {
try {
return wxPayService.parseOrderNotifyResult(xmlData);
} catch (WxPayException e) {
@@ -171,7 +173,7 @@
}
}
- public WxPayRefundNotifyResult parseRefundNotifyResult(WxPayService wxPayService, String xmlData) {
+ public WxPayRefundNotifyResult parseRefundNotifyResult( String xmlData) {
try {
return wxPayService.parseRefundNotifyResult(xmlData);
} catch (WxPayException e) {
@@ -189,7 +191,7 @@
* @param callbackUrl
* @return
*/
- public boolean refundOrder(WxPayService wxPayService, String orderId, String refundSn, Integer refundFee, String callbackUrl) {
+ public boolean refundOrder( String orderId, String refundSn, Integer refundFee, String callbackUrl) {
WxPayRefundRequest refundRequest = new WxPayRefundRequest();
refundRequest.setOutTradeNo(orderId);
refundRequest.setOutRefundNo(refundSn);
@@ -214,7 +216,7 @@
/**
* 鐢熸垚浜岀淮鐮佷粯娆�
*/
- public String generateQRCodePay(WxPayService wxPayService, String body,
+ public String generateQRCodePay( String body,
String orderId, int totalFee, String callbackUrl) {
WxPayUnifiedOrderRequest wxPayUnifiedOrderRequest = new WxPayUnifiedOrderRequest();
wxPayUnifiedOrderRequest.setBody(body);
--
Gitblit v1.9.3