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/mapper/MallOrderItemMapper.java | 1 +
src/main/resources/mapper/modules/MallOrderItemMapper.xml | 5 +++++
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallTeamLeaderServiceImpl.java | 5 ++++-
3 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderItemMapper.java b/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderItemMapper.java
index babed24..d451d11 100644
--- a/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderItemMapper.java
+++ b/src/main/java/cc/mrbird/febs/mall/mapper/MallOrderItemMapper.java
@@ -13,6 +13,7 @@
List<MallOrderItem> selectItemBySkuIdUnCancel(@Param("skuId") Long skuId, @Param("memberId") Long memberId);
List<MallOrderItem> selectListByNotInStateAndOrderId(@Param("state")Integer i, @Param("orderId")Long orderId);
+ List<MallOrderItem> selectListByStateAndOrderId(@Param("state")Integer i, @Param("orderId")Long orderId);
void updateStateByOrderId(@Param("state")Integer i, @Param("orderId")Long id);
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 df0e747..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
@@ -420,7 +420,10 @@
//退款退款金额
BigDecimal refundAmount = mallRefundEntity.getAmount();
- refundAmount = refundAmount.add(mallOrderInfo.getCarriage());
+ 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();
diff --git a/src/main/resources/mapper/modules/MallOrderItemMapper.xml b/src/main/resources/mapper/modules/MallOrderItemMapper.xml
index 8bfdc43..79a5ec9 100644
--- a/src/main/resources/mapper/modules/MallOrderItemMapper.xml
+++ b/src/main/resources/mapper/modules/MallOrderItemMapper.xml
@@ -19,6 +19,11 @@
where a.state != #{state} and a.order_id=#{orderId}
</select>
+ <select id="selectListByStateAndOrderId" resultType="cc.mrbird.febs.mall.entity.MallOrderItem">
+ select a.* from mall_order_item a
+ where a.state = #{state} and a.order_id=#{orderId}
+ </select>
+
<update id="updateStateByOrderId">
update mall_order_item
set state = #{state}
--
Gitblit v1.9.1