From d9a9d8a2dad1d1e57b184bf8f972a03d654d883a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 22 七月 2022 15:07:01 +0800
Subject: [PATCH] 优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java | 170 ++++++++++++++++++++------------------------------------
1 files changed, 61 insertions(+), 109 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 22975ae..698ae8e 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.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.dreampie.encription.EncriptionKit;
-import cn.hutool.core.codec.Base64;
import cn.hutool.http.HttpUtil;
import com.alibaba.fastjson.JSON;
import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
@@ -10,6 +13,7 @@
import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
import com.github.binarywang.wxpay.bean.result.WxPayRefundResult;
import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderResult;
+import com.github.binarywang.wxpay.config.WxPayConfig;
import com.github.binarywang.wxpay.constant.WxPayConstants;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.sandu.common.execption.BusinessException;
@@ -19,6 +23,8 @@
import com.sandu.ximon.dao.domain.WxConfigEntity;
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;
@@ -42,76 +48,6 @@
public static final String WECHAT_ORDER_QUETY = "?mchid=";
private final UsrWxPayConfigService wxPayConfigService;
-
-
- /**
- * app鏀粯
- *
- * @param body 鍟嗗搧鎻忚堪
- * @param
- * @param totalFee 鏀粯閲戦锛堝垎锛�
- * @return
- */
- public SortedMap<Object, Object> appPay(String body, String orderSn, int totalFee, Long poleId) {
- WxConfigEntity wxConfig = wxPayConfigService.getConfigByPoleId(poleId);
- wxConfig.setMchId(wxConfig.getMchId().trim());
- WxPayUnifiedOrderRequest wxPayUnifiedOrderRequest = new WxPayUnifiedOrderRequest();
- wxPayUnifiedOrderRequest.setBody(body);
- wxPayUnifiedOrderRequest.setOutTradeNo(orderSn);
- wxPayUnifiedOrderRequest.setTotalFee(totalFee);
- wxPayUnifiedOrderRequest.setOpenid("otiM54x_hc_5gbhMY5aZxo7UByNo");
-
- wxPayUnifiedOrderRequest.setSignType(WxPayConstants.SignType.MD5);
- wxPayUnifiedOrderRequest.setSpbillCreateIp(IpUtil.getRealIp());
- wxPayUnifiedOrderRequest.setNotifyUrl(WECHAT_ORDER_PAY_CALLBACK_URL);
- wxPayUnifiedOrderRequest.setTradeType(WxPayConstants.TradeType.JSAPI);
-
- try {
- WxPayUnifiedOrderResult wxPayUnifiedOrderResult = wxPayService.unifiedOrder(wxPayUnifiedOrderRequest);
- System.out.println("********************************");
- 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("noncestr", wxPayUnifiedOrderResult.getNonceStr()); // 闅忔満瀛楃涓�
- parameters.put("partnerid", wxConfig.getMchId()); // 鍟嗘埛id
-
- // parameters.put("out_trade_no", orderId);//鍟嗘埛璁㈠崟鍙�
- parameters.put("prepayid", wxPayUnifiedOrderResult.getPrepayId());
- parameters.put("package", "Sign=WXPay");
- parameters.put("timestamp", time);
-
- String sign = createSign(wxConfig.getPrivateKey(), parameters);
-
- //hashMap.put("paySign", wechatSign);
- parameters.put("Sign", sign);
- return parameters;
- } else {
- log.error("寰俊鏀粯澶辫触锛寋}", wxPayUnifiedOrderResult.getErrCodeDes());
- throw new BusinessException("寰俊鏀粯澶辫触锛�" + wxPayUnifiedOrderResult.getErrCodeDes());
- }
- } catch (WxPayException e) {
- log.error("寰俊鏀粯澶辫触锛寋}", e.getErrCodeDes());
- throw new BusinessException("寰俊鏀粯澶辫触锛�" + e.getErrCodeDes());
- }
- }
-
- /* private String createSign(SortedMap<Object, Object> parameters) {
- StringBuffer sb = new StringBuffer();
- Set es = parameters.entrySet();// 鎵�鏈夊弬涓庝紶鍙傜殑鍙傛暟鎸夌収accsii鎺掑簭锛堝崌搴忥級
- 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)) {
- sb.append(k + "=" + v + "&");
- }
- }
- sb.append("key=" + wxPayProperties.getMchKey());
- System.out.println("瀛楃涓叉嫾鎺ュ悗鏄�:" + sb.toString());
- return SecureUtil.md5(sb.toString()).toUpperCase();
- }*/
/**
@@ -207,38 +143,6 @@
/**
- * 鐢熸垚浜岀淮鐮佷粯娆�
- */
- public String generateQRCodePay(String body,
- String orderId, int totalFee, String callbackUrl) {
- WxPayUnifiedOrderRequest wxPayUnifiedOrderRequest = new WxPayUnifiedOrderRequest();
- wxPayUnifiedOrderRequest.setBody(body);
- wxPayUnifiedOrderRequest.setOutTradeNo(orderId);
- wxPayUnifiedOrderRequest.setTotalFee(totalFee);
- wxPayUnifiedOrderRequest.setProductId(orderId);
-
- wxPayUnifiedOrderRequest.setSignType(WxPayConstants.SignType.MD5);
- wxPayUnifiedOrderRequest.setSpbillCreateIp(IpUtil.getRealIp());
- wxPayUnifiedOrderRequest.setNotifyUrl(callbackUrl);
- wxPayUnifiedOrderRequest.setTradeType(WxPayConstants.TradeType.NATIVE);
-
- try {
- WxPayUnifiedOrderResult wxPayUnifiedOrderResult = wxPayService.unifiedOrder(wxPayUnifiedOrderRequest);
- if (WxPayConstants.ResultCode.SUCCESS.equals(wxPayUnifiedOrderResult.getResultCode())) {
- byte[] scanPayQrcodeMode2 = wxPayService.createScanPayQrcodeMode2(wxPayUnifiedOrderResult.getCodeURL(), null, null);
- String encode = Base64.encode(scanPayQrcodeMode2);
- return encode;
- } else {
- log.error("寰俊鏀粯澶辫触锛寋}", wxPayUnifiedOrderResult.getErrCodeDes());
- throw new BusinessException("寰俊鏀粯澶辫触锛�" + wxPayUnifiedOrderResult.getErrCodeDes());
- }
- } catch (WxPayException e) {
- log.error("寰俊鏀粯澶辫触锛寋}", e.getErrCodeDes());
- throw new BusinessException("寰俊鏀粯澶辫触锛�" + e.getErrCodeDes());
- }
- }
-
- /**
* 閫�娆�
*
* @param totalAmount
@@ -247,11 +151,16 @@
* @param poleId
* @return
*/
+ @Transactional(rollbackFor = Exception.class)
public boolean refund(Double totalAmount, Double refundAmount, String outTradeNo, Long poleId) {
WxConfigEntity wxConfig = UsrWxPayConfigService.getBean().getConfigByPoleId(poleId);
SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
String refundNo = sdf.format(new Date());
WxPayRefundRequest refundRequest = new WxPayRefundRequest();
+ //閫�娆鹃噾棰濅笉鑳藉ぇ浜庤鍗曟�婚噾棰�
+ if (refundAmount > totalAmount) {
+ throw new BusinessException("閫�娆鹃噾棰濅笉鑳藉ぇ浜庤鍗曟�婚噾棰�");
+ }
refundRequest.setOutTradeNo(outTradeNo);
refundRequest.setOutRefundNo(refundNo);
refundRequest.setTotalFee(Integer.valueOf(parseWxAmount((totalAmount + ""))));
@@ -285,24 +194,45 @@
return amount;
}
-
+ /**
+ * 灏忕▼搴忔敮浠� 寰俊
+ *
+ * @param body
+ * @param orderId
+ * @param totalFee
+ * @param poleId
+ * @return
+ */
@Transactional(rollbackFor = Exception.class)
- public SortedMap<Object, Object> miniAppPay(String body,
- String orderId, int totalFee, Long poleId) {
+ public SortedMap<Object, Object> miniAppPay(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.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(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.setNotifyUrl(WECHAT_ORDER_PAY_CALLBACK_URL);
wxPayUnifiedOrderRequest.setTradeType(WxPayConstants.TradeType.JSAPI);
- System.out.println("-----------"+wxPayUnifiedOrderRequest);
+ System.out.println("-----------" + wxPayUnifiedOrderRequest);
+
try {
WxPayUnifiedOrderResult wxPayUnifiedOrderResult = wxPayService.unifiedOrder(wxPayUnifiedOrderRequest);
String time = String.valueOf(System.currentTimeMillis() / 1000);
@@ -333,4 +263,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