From 7de15911c90c5861d6e26e29550b6c60b09952c7 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 12 十月 2023 18:30:20 +0800
Subject: [PATCH] 修复

---
 server/services/src/main/java/com/doumee/core/wx/WxMiniUtilService.java |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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..e472eb2 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
@@ -52,6 +52,7 @@
             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 +62,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