From b3810c8cb1fb0b9b33cd42fcabd0cf30bacab37d Mon Sep 17 00:00:00 2001
From: Administrator <15274802129@163.com>
Date: Wed, 14 May 2025 15:02:50 +0800
Subject: [PATCH] feat(mall): 添加商品积分价格字段

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

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 ea14883..a979b39 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
@@ -420,6 +420,7 @@
 
             //退款退款金额
             BigDecimal refundAmount = mallRefundEntity.getAmount();
+            refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
             BigDecimal bb = new BigDecimal(100);
             int refundMoney = refundAmount.multiply(bb).intValue();
 
@@ -440,7 +441,7 @@
                 mallRefundEntity.setState(1);
                 mallRefundEntity.setUpdatedTime(DateUtil.date());
                 mallRefundMapper.updateById(mallRefundEntity);
-                mallMoneyFlowService.addMoneyFlow(mallOrderInfo.getMemberId(), refundAmount, MoneyFlowTypeEnum.REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
+                mallMoneyFlowService.addMoneyFlow(mallOrderInfo.getMemberId(), refundAmount, MoneyFlowTypeEnum.REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue(),"余额退款",2);
 
                 List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByNotInStateAndOrderId(3,orderId);
                 if(CollUtil.isEmpty(mallOrderItemList)){
@@ -482,7 +483,7 @@
                 mallRefundEntity.setState(1);
                 mallRefundEntity.setUpdatedTime(DateUtil.date());
                 mallRefundMapper.updateById(mallRefundEntity);
-                mallMoneyFlowService.addMoneyFlow(mallOrderInfo.getMemberId(), refundAmount, MoneyFlowTypeEnum.REFUND.getValue(), mallOrderInfo.getOrderNo(), FlowTypeEnum.BALANCE.getValue());
+                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)){

--
Gitblit v1.9.1