From ec63fb17c5ba3e5b2a5a4106c25b4e249a2f980f Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 22 十一月 2022 18:44:51 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/pay/wx/WxFastPayService.java | 71 +++++++++++++++--------------------
1 files changed, 31 insertions(+), 40 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 8097189..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
@@ -19,9 +19,13 @@
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;
@@ -138,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());
--
Gitblit v1.9.3