From aa6febca297b0e1a68b1877fc9f41885e9fc0c7a Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期一, 16 十月 2023 15:56:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
index 295eb7e..c9227a3 100644
--- a/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
+++ b/server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java
@@ -46,12 +46,18 @@
WxPayRefundRequest request = new WxPayRefundRequest();
request.setOutTradeNo(refundDTO.getOrderId());
request.setOutRefundNo(refNum);
- request.setTotalFee(BaseWxPayRequest.yuanToFen(refundDTO.getTotalAmount().toString()));
- request.setRefundFee(BaseWxPayRequest.yuanToFen(refundDTO.getRefundAmount().toString()));
+// request.setTotalFee(BaseWxPayRequest.yuanToFen(refundDTO.getTotalAmount().toString()));
+// request.setRefundFee(BaseWxPayRequest.yuanToFen(refundDTO.getRefundAmount().toString()));
+ System.out.println("瀹為檯鎬婚噾棰�" + BaseWxPayRequest.yuanToFen(refundDTO.getTotalAmount().toString()));
+ System.out.println("瀹為檯閫�娆鹃噾棰�" + BaseWxPayRequest.yuanToFen(refundDTO.getRefundAmount().toString()));
+
+ request.setTotalFee(1);
+ request.setRefundFee(1);
WxPayRefundResult response = WxMiniConfig.wxPayService.refund(request);
if ("SUCCESS".equals(response.getReturnCode()) && "SUCCESS".equals(response.getResultCode())) {
//瀛樺偍閫�娆捐褰� 涓� 娴佹按璁板綍
Refund refund = new Refund();
+ refund.setId(Constants.getUUID());
refund.setCreateDate(new Date());
refund.setMemberId(refundDTO.getMemberId());
refund.setMoney(refundDTO.getRefundAmount());
@@ -61,20 +67,22 @@
refund.setType(refundDTO.getType());
refund.setObjId(refundDTO.getOrderId());
refund.setReason(refundDTO.getReason());
+ refund.setCanBalance(refundDTO.getCanBalance());
refundMapper.insert(refund);
//瀛樺偍浜ゆ槗娴佹按琛�
Transactions transactions = new Transactions();
+ transactions.setId(Constants.getUUID());
transactions.setMemberId(refundDTO.getMemberId());
transactions.setCreateDate(new Date());
transactions.setIsdeleted(Constants.ZERO);
transactions.setOrderId(refundDTO.getOrderId());
transactions.setMoney(refundDTO.getRefundAmount());
- transactions.setType(refundDTO.getType()==Constants.transactionsType.refund?Constants.transactionsType.platformRefund:Constants.transactionsType.refund);
+ transactions.setType(refundDTO.getType()==Constants.TRANSACTIONS_TYPE.REFUND.getKey()?Constants.TRANSACTIONS_TYPE.PLATFORMREFUND.getKey():Constants.REFUND_TYPE.BACK.getKey());
transactions.setPreOrderid(refundDTO.getOrderId());
transactions.setOnlineOrderid(refNum);
transactions.setDoneDate(new Date());
- transactions.setTitle("閫�娆�");
- transactions.setContent(refundDTO.getType()==Constants.transactionsType.refund?"骞冲彴閫�娆�":"缁撶畻閫�娆�");
+ transactions.setTitle(Constants.TRANSACTIONS_TYPE.get(transactions.getType()).getName());
+ transactions.setContent(Constants.TRANSACTIONS_TYPE.get(transactions.getType()).getInfo());
transactions.setBalance(BigDecimal.ZERO);
transactions.setObjId(refund.getId());
transactions.setObjType(Constants.ONE);
--
Gitblit v1.9.3