From 43927c5cc3210bc77455505557befece54e33ca7 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 31 May 2024 16:37:52 +0800
Subject: [PATCH] 图片上传
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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..9227e68 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
@@ -410,7 +410,7 @@
mallRefundMapper.updateById(mallRefundEntity);
return new FebsResponse().success().message("操作成功");
}else{//退款订单编号
- String orderNo = mallOrderInfo.getOrderNo();
+ String orderNo = mallOrderInfo.getOrderNo()+ mallOrderItem.getId().toString();
//退款退款编号
String refundNo = mallRefundEntity.getRefundNo();
//退款订单金额
@@ -420,6 +420,10 @@
//退款退款金额
BigDecimal refundAmount = mallRefundEntity.getAmount();
+ List<MallOrderItem> mallOrderItemList1 = mallOrderItemMapper.selectListByStateAndOrderId(1,orderId);
+ if(CollUtil.isEmpty(mallOrderItemList1)){
+ refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
+ }
BigDecimal bb = new BigDecimal(100);
int refundMoney = refundAmount.multiply(bb).intValue();
@@ -440,7 +444,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 +486,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