From 350608105f300c6c629d743dc9896feca2f22e8d Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 16:11:49 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java | 168 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 106 insertions(+), 62 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 e0d9746..3193607 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
@@ -1,7 +1,10 @@
package com.sandu.ximon.admin.pay.wx;
-import cn.dreampie.encription.EncriptionKit;
-import cn.hutool.core.codec.Base64;
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import cn.hutool.crypto.SecureUtil;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
@@ -13,17 +16,24 @@
import com.github.binarywang.wxpay.config.WxPayConfig;
import com.github.binarywang.wxpay.constant.WxPayConstants;
import com.github.binarywang.wxpay.exception.WxPayException;
+import com.github.binarywang.wxpay.service.WxPayService;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.util.IpUtil;
+import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.dto.wxquerydto.WxOrderDto;
import com.sandu.ximon.admin.pay.wxpay.UsrWxPayConfigService;
+import com.sandu.ximon.admin.service.C3mOrderService;
+import com.sandu.ximon.dao.domain.C3mOrder;
import com.sandu.ximon.dao.domain.WxConfigEntity;
+import com.sandu.ximon.dao.enums.OrderStatus;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
+import me.chanjar.weixin.common.error.WxErrorException;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.servlet.http.HttpServletRequest;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -38,13 +48,12 @@
public class WxFastPayService {
private final com.github.binarywang.wxpay.service.WxPayService wxPayService;
- public static final String WECHAT_ORDER_PAY_CALLBACK_URL = "http://49.235.239.118:20012/callback/pay/wechatCallback";
+ public static final String WECHAT_ORDER_PAY_CALLBACK_URL = "http://112.74.63.130:20017/callback/pay/wechatCallback";
//寰俊璁㈠崟鐘舵�佹煡璇�
public static final String WECHAT_ORDER_QUETY_URL = "https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/";
public static final String WECHAT_ORDER_QUETY = "?mchid=";
private final UsrWxPayConfigService wxPayConfigService;
-
/**
@@ -74,11 +83,11 @@
*/
@SuppressWarnings("rawtypes")
private String createSign(String Key, SortedMap<Object, Object> parameters) {
+
StringBuffer sb = new StringBuffer();
Set es = parameters.entrySet();// 鎵�鏈夊弬涓庝紶鍙傜殑鍙傛暟鎸夌収accsii鎺掑簭锛堝崌搴忥級
- Iterator it = es.iterator();
- while (it.hasNext()) {
- Map.Entry entry = (Map.Entry) it.next();
+ for (Object e : es) {
+ Map.Entry entry = (Map.Entry) e;
String k = (String) entry.getKey();
Object v = entry.getValue();
if (null != v && !"".equals(v) && !"sign".equals(k) && !"key".equals(k)) {
@@ -87,11 +96,35 @@
}
sb.append("key=" + Key);
System.out.println("瀛楃涓叉嫾鎺ュ悗鏄�:" + sb.toString());
- String sign = EncriptionKit.encrypt(sb.toString()).toUpperCase();
- return sign;
+ return SecureUtil.md5(sb.toString()).toUpperCase();
+// StringBuffer sb = new StringBuffer();
+// Set es = parameters.entrySet();// 鎵�鏈夊弬涓庝紶鍙傜殑鍙傛暟鎸夌収accsii鎺掑簭锛堝崌搴忥級
+// Iterator it = es.iterator();
+// while (it.hasNext()) {
+// Map.Entry entry = (Map.Entry) it.next();
+// String k = (String) entry.getKey();
+// Object v = entry.getValue();
+// if (null != v && !"".equals(v) && !"sign".equals(k) && !"key".equals(k)) {
+// sb.append(k + "=" + v + "&");
+// }
+// }
+// sb.append("key=" + Key);
+// System.out.println("瀛楃涓叉嫾鎺ュ悗鏄�:" + sb.toString());
+// String sign = EncriptionKit.encrypt(sb.toString()).toUpperCase();
+// return sign;
}
public WxPayOrderNotifyResult parseOrderNotifyResult(String xmlData) {
+ try {
+ return wxPayService.parseOrderNotifyResult(xmlData);
+ } catch (WxPayException e) {
+ e.printStackTrace();
+ throw new BusinessException("瑙ｆ瀽鍥炶皟缁撴灉澶辫触锛�" + e.getErrCodeDes());
+ }
+ }
+
+
+ public WxPayOrderNotifyResult parseOrderNotifyResult(WxPayService wxPayService, String xmlData) {
try {
return wxPayService.parseOrderNotifyResult(xmlData);
} catch (WxPayException e) {
@@ -109,62 +142,49 @@
}
}
- /**
- * 璁㈠崟閫�娆� 鍙兘閫�娆句竴娆�
- *
- * @param orderId
- * @param refundFee
- * @param callbackUrl
- * @return
- */
- public boolean refundOrder(String orderId, String refundSn, Integer refundFee, String callbackUrl) {
- WxPayRefundRequest refundRequest = new WxPayRefundRequest();
- refundRequest.setOutTradeNo(orderId);
- refundRequest.setOutRefundNo(refundSn);
- refundRequest.setRefundFee(refundFee);
- refundRequest.setTotalFee(refundFee);
- refundRequest.setNotifyUrl(callbackUrl);
- try {
- WxPayRefundResult wxPayRefundResult = wxPayService.refund(refundRequest);
- if (WxPayConstants.ResultCode.SUCCESS.equals(wxPayRefundResult.getResultCode())) {
- return true;
- } else {
- log.error("寰俊閫�娆惧け璐ワ紝{}", wxPayRefundResult.getErrCodeDes());
- throw new BusinessException("寰俊閫�娆惧け璐ワ紝" + wxPayRefundResult.getErrCodeDes());
- }
- } catch (WxPayException e) {
- log.error("寰俊閫�娆惧け璐ワ紝{}", e.getErrCodeDes());
- throw new BusinessException("寰俊閫�娆惧け璐ワ紝" + e.getErrCodeDes());
- }
- }
-
/**
* 閫�娆�
- *
- * @param totalAmount
- * @param refundAmount
- * @param outTradeNo
- * @param poleId
* @return
*/
@Transactional(rollbackFor = Exception.class)
- public boolean refund(Double totalAmount, Double refundAmount, String outTradeNo, Long poleId) {
- WxConfigEntity wxConfig = UsrWxPayConfigService.getBean().getConfigByPoleId(poleId);
+ public boolean refund(C3mOrder c3mOrder) {
+
+ WxConfigEntity wxConfig = wxPayConfigService.getConfigByPoleId(c3mOrder.getPoleId());
+
+ if (wxConfig.getKeyPath() == null && wxConfig.getKeyPath().isEmpty()) {
+ throw new BusinessException("寰俊璇佷功涓嶅瓨鍦�,鏃犳硶杩涜閫�娆�");
+ }
+ //璁剧疆寰俊鏀粯鍙傛暟
+ WxPayConfig payConfig = new WxPayConfig();
+
+ payConfig.setAppId(StringUtils.trimToNull(wxConfig.getAppappid()));
+ payConfig.setMchId(StringUtils.trimToNull(wxConfig.getMchId()));
+ payConfig.setMchKey(StringUtils.trimToNull(wxConfig.getPrivateKey()));
+ payConfig.setSubAppId(StringUtils.trimToNull(null));
+ payConfig.setSubMchId(StringUtils.trimToNull(null));
+ payConfig.setKeyPath(StringUtils.trimToNull(wxConfig.getKeyPath()));
+ wxPayService.setConfig(payConfig);
+
+
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
String refundNo = sdf.format(new Date());
WxPayRefundRequest refundRequest = new WxPayRefundRequest();
//閫�娆鹃噾棰濅笉鑳藉ぇ浜庤鍗曟�婚噾棰�
- if (refundAmount > totalAmount) {
+ if (c3mOrder.getRefundAmount() > c3mOrder.getTotalAmount()) {
throw new BusinessException("閫�娆鹃噾棰濅笉鑳藉ぇ浜庤鍗曟�婚噾棰�");
}
- refundRequest.setOutTradeNo(outTradeNo);
+ System.out.println("" + c3mOrder.getRefundAmount());
+ refundRequest.setOutTradeNo(c3mOrder.getOutTradeNo());
refundRequest.setOutRefundNo(refundNo);
- refundRequest.setTotalFee(Integer.valueOf(parseWxAmount((totalAmount + ""))));
- refundRequest.setRefundFee(Integer.valueOf(parseWxAmount((refundAmount + ""))));
+ refundRequest.setTotalFee(Integer.valueOf(parseWxAmount((c3mOrder.getTotalAmount() + ""))));
+ refundRequest.setRefundFee(Integer.valueOf(parseWxAmount((c3mOrder.getRefundAmount() + ""))));
try {
WxPayRefundResult wxPayRefundResult = wxPayService.refund(refundRequest);
if (WxPayConstants.ResultCode.SUCCESS.equals(wxPayRefundResult.getResultCode())) {
+ c3mOrder.setOrderStatus(OrderStatus.REFUND.getStatus());
+ c3mOrder.setChargingStates(1);
+ SpringContextHolder.getBean(C3mOrderService.class).updateById(c3mOrder);
return true;
} else {
log.error("寰俊閫�娆惧け璐ワ紝{}", wxPayRefundResult.getErrCodeDes());
@@ -201,13 +221,13 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- public SortedMap<Object, Object> miniAppPay(String body,
- String orderId, int totalFee, Long poleId) {
+ public SortedMap<Object, Object> miniAppPay(HttpServletRequest request, String body, String orderId, int totalFee, Long poleId, String wxCode) throws WxErrorException {
WxConfigEntity wxConfig = wxPayConfigService.getConfigByPoleId(poleId);
- wxConfig.setMchId(wxConfig.getMchId().trim());
+
//璁剧疆寰俊鏀粯鍙傛暟
WxPayConfig payConfig = new WxPayConfig();
- payConfig.setAppId(StringUtils.trimToNull(wxConfig.getAppid()));
+
+ payConfig.setAppId(StringUtils.trimToNull(wxConfig.getAppappid()));
payConfig.setMchId(StringUtils.trimToNull(wxConfig.getMchId()));
payConfig.setMchKey(StringUtils.trimToNull(wxConfig.getPrivateKey()));
payConfig.setSubAppId(StringUtils.trimToNull(null));
@@ -215,16 +235,17 @@
payConfig.setKeyPath(StringUtils.trimToNull(null));
wxPayService.setConfig(payConfig);
+
//璁剧疆寰俊鍚屼竴璁㈠崟璇锋眰
WxPayUnifiedOrderRequest wxPayUnifiedOrderRequest = new WxPayUnifiedOrderRequest();
wxPayUnifiedOrderRequest.setBody(body);
wxPayUnifiedOrderRequest.setOutTradeNo(orderId);
wxPayUnifiedOrderRequest.setTotalFee(totalFee);
-// wxPayUnifiedOrderRequest.setOpenid("otiM54x_hc_5gbhMY5aZxo7UByNo");
+ wxPayUnifiedOrderRequest.setOpenid(wxCode);
wxPayUnifiedOrderRequest.setSignType(WxPayConstants.SignType.MD5);
- wxPayUnifiedOrderRequest.setSpbillCreateIp(IpUtil.getRealIp());
+ wxPayUnifiedOrderRequest.setSpbillCreateIp(IpUtil.getIpAddr(request));
wxPayUnifiedOrderRequest.setNotifyUrl(WECHAT_ORDER_PAY_CALLBACK_URL);
wxPayUnifiedOrderRequest.setTradeType(WxPayConstants.TradeType.JSAPI);
System.out.println("-----------" + wxPayUnifiedOrderRequest);
@@ -234,20 +255,21 @@
String time = String.valueOf(System.currentTimeMillis() / 1000);
if (WxPayConstants.ResultCode.SUCCESS.equals(wxPayUnifiedOrderResult.getResultCode())) {
SortedMap<Object, Object> parameters = new TreeMap<>();
- parameters.put("appid", wxPayUnifiedOrderResult.getAppid());
+ parameters.put("appId", wxPayUnifiedOrderResult.getAppid());
- parameters.put("noncestr", wxPayUnifiedOrderResult.getNonceStr()); // 闅忔満瀛楃涓�
- parameters.put("partnerid", wxConfig.getMchId()); // 鍟嗘埛id
+ parameters.put("nonceStr", wxPayUnifiedOrderResult.getNonceStr()); // 闅忔満瀛楃涓�
+// parameters.put("partnerid", wxConfig.getMchId()); // 鍟嗘埛id
+ parameters.put("signType", WxPayConstants.SignType.MD5);
// parameters.put("out_trade_no", orderId);//鍟嗘埛璁㈠崟鍙�
- parameters.put("prepayid", wxPayUnifiedOrderResult.getPrepayId());
- parameters.put("package", "Sign=WXPay");
- parameters.put("timestamp", time);
+// parameters.put("prepayid", wxPayUnifiedOrderResult.getPrepayId());
+ parameters.put("package", "prepay_id=" + wxPayUnifiedOrderResult.getPrepayId());
+ parameters.put("timeStamp", time);
String sign = createSign(wxConfig.getPrivateKey(), parameters);
//hashMap.put("paySign", wechatSign);
- parameters.put("Sign", sign);
+ parameters.put("paySign", sign);
return parameters;
} else {
log.error("寰俊鏀粯澶辫触锛寋}", wxPayUnifiedOrderResult.getErrCodeDes());
@@ -259,4 +281,26 @@
}
}
+
+ public WxMaService getWxMaService(WxConfigEntity wxConfig) {
+ if (wxConfig == null) {
+ throw new BusinessException("鎵句笉鍒板井淇￠厤缃�");
+ }
+ WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+ config.setAppid(wxConfig.getAppappid());
+ config.setSecret(wxConfig.getAppSecret());
+ WxMaService service = new WxMaServiceImpl();
+ service.setWxMaConfig(config);
+ return service;
+ }
+
+ public String getOpenId(Long poleId, String wxCode) throws WxErrorException {
+ WxConfigEntity userConfig = wxPayConfigService.getConfigByPoleId(poleId);
+ if (userConfig == null) {
+ throw new BusinessException("鎵句笉鍒板井淇￠厤缃�");
+ }
+ WxMaJscode2SessionResult sessionInfo = this.getWxMaService(userConfig).getUserService().getSessionInfo(wxCode);
+ return sessionInfo.getOpenid();
+ }
+
}
--
Gitblit v1.9.3