From 832c911439b27f96596aff9d0e67ddc1e0ce2cf3 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 29 Aug 2022 17:15:58 +0800
Subject: [PATCH] 20220822

---
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index b213d54..e30df3b 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -749,9 +749,17 @@
             return new FebsResponse().fail().message("该订单无法申请退款");
         }
 
-        MallOrderItem mallOrderItem = mallOrderItemMapper.selectById(itemId);
         MallRefundEntity mallRefundEntity = new MallRefundEntity();
-        mallRefundEntity.setRefundNo(mallOrderInfo.getOrderNo()+"_RITEM"+itemId);
+        MallOrderItem mallOrderItem = mallOrderItemMapper.selectById(itemId);
+        if(ObjectUtil.isNotEmpty(mallOrderItem)){
+            mallOrderItem.setState(2);
+            mallOrderItemMapper.updateById(mallOrderItem);
+            mallRefundEntity.setRefundNo(mallOrderInfo.getOrderNo()+"_RITEM"+itemId);
+            mallRefundEntity.setItemId(itemId);
+        }else{
+
+            mallRefundEntity.setRefundNo(mallOrderInfo.getOrderNo()+"_R"+orderId);
+        }
         mallRefundEntity.setRefundReason(applyRefundOrderDto.getRefundReason());
         mallRefundEntity.setRefundRemark(applyRefundOrderDto.getRefundRemark());
         mallRefundEntity.setRefundPic(applyRefundOrderDto.getRefundPic());
@@ -759,7 +767,6 @@
         mallRefundEntity.setState(3);
         mallRefundEntity.setType(1);
         mallRefundEntity.setOrderId(orderId);
-        mallRefundEntity.setItemId(itemId);
         mallRefundEntity.setAmount(mallOrderItem.getAmount());
         mallRefundMapper.insert(mallRefundEntity);
         return new FebsResponse().success().message("已申请");

--
Gitblit v1.9.1