From 63aab4871b1da0979f247c73047ff2d1dba26192 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 02 Mar 2023 18:01:17 +0800
Subject: [PATCH] 资金流水修改
---
src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java | 9 +++++++--
src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html | 5 ++++-
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 2 +-
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java b/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java
index f6cf4e9..eac5287 100644
--- a/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java
+++ b/src/main/java/cc/mrbird/febs/common/enumerates/MoneyFlowTypeEnum.java
@@ -56,7 +56,7 @@
*/
PAY(10),
/**
- * 退款
+ * 余额退款
*/
REFUND(11),
@@ -108,7 +108,12 @@
/**
* 微信支付
*/
- WECHAT_PAY(21);
+ WECHAT_PAY(21),
+
+ /**
+ * 微信退款
+ */
+ WECHAT_REFUND(22);
private final int value;
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
index 863f4e6..b6d5d37 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java
@@ -482,7 +482,7 @@
mallRefundEntity.setState(1);
mallRefundEntity.setUpdatedTime(DateUtil.date());
mallRefundMapper.updateById(mallRefundEntity);
- mallMoneyFlowService.addMoneyFlow(mallOrderInfo.getMemberId(), refundAmount, MoneyFlowTypeEnum.REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"微信退款",2);
+ mallMoneyFlowService.addMoneyFlow(mallOrderInfo.getMemberId(), refundAmount, MoneyFlowTypeEnum.WECHAT_REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.WECHAT.getValue(),"微信退款",2);
List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByNotInStateAndOrderId(3,orderId);
if(CollUtil.isEmpty(mallOrderItemList)){
diff --git a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
index 44c49d4..8eb1a87 100644
--- a/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
+++ b/src/main/resources/templates/febs/views/modules/mallMember/moneyFlowList.html
@@ -34,7 +34,7 @@
<!-- <option value="8">提现</option>-->
<!-- <option value="9">转账</option>-->
<option value="10">余额支付</option>
- <option value="11">退款</option>
+ <option value="11">余额退款</option>
<!-- <option value="12">佣金转竞猜积分</option>-->
<!-- <option value="13">佣金转余额</option>-->
<!-- <option value="14">竞猜积分签到</option>-->
@@ -44,6 +44,7 @@
<option value="18">充值</option>
<option value="20">赠送金额</option>
<option value="21">微信支付</option>
+ <option value="22">微信退款</option>
<!-- <option value="19">收益</option>-->
</select>
</div>
@@ -197,6 +198,8 @@
return '<span>赠送金额</span>'
}else if (d.type === 21) {
return '<span>微信支付</span>'
+ }else if (d.type === 22) {
+ return '<span>微信退款</span>'
}else{
return ''
}
--
Gitblit v1.9.1