From 91bef4a27ba5fd87ad5970321d9a465f48158f34 Mon Sep 17 00:00:00 2001
From: jjLv <1981429112@qq.com>
Date: Thu, 22 May 2025 09:30:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E9=93=BE-=E9=80=80=E5=8D=95g?=
 =?UTF-8?q?it=E5=90=88=E5=B9=B6=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/supply/dto/DrpRefundGoodsPageDTO.java     |  2 --
 .../service/impl/DrpRefundGoodsServiceImpl.java    | 14 ++++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpRefundGoodsPageDTO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpRefundGoodsPageDTO.java
index 4cdaf9f..8460ab8 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpRefundGoodsPageDTO.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/dto/DrpRefundGoodsPageDTO.java
@@ -68,7 +68,6 @@ public class DrpRefundGoodsPageDTO  {
       return this.crtimeEnd;
    }
 
-
    public String getRelateOrderGoodsId() {
       return this.relateOrderGoodsId;
    }
@@ -125,7 +124,6 @@ public class DrpRefundGoodsPageDTO  {
       return this;
    }
 
-
    public DrpRefundGoodsPageDTO setRelateOrderGoodsId(final String relateOrderGoodsId) {
       this.relateOrderGoodsId = relateOrderGoodsId;
       return this;
diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/impl/DrpRefundGoodsServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/impl/DrpRefundGoodsServiceImpl.java
index b24cfa6..677930a 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/impl/DrpRefundGoodsServiceImpl.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/supply/service/impl/DrpRefundGoodsServiceImpl.java
@@ -19,12 +19,12 @@ import com.bonus.canteen.core.utils.CustomIdGenerateUtil;
 import com.bonus.common.houqin.constant.DelFlagEnum;
 import com.bonus.common.houqin.utils.LeBeanUtil;
 import com.bonus.common.houqin.utils.id.Id;
-import com.github.pagehelper.page.PageMethod;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -50,11 +50,12 @@ public class DrpRefundGoodsServiceImpl extends ServiceImpl<DrpRefundGoodsMapper,
       String refundGoodsId = CustomIdGenerateUtil.generateRefundGoodsId();
       drpRefundGoods.setRefundGoodsId(refundGoodsId);
       drpRefundGoods.setRelateOrderGoodsId(content.getOrderGoodsId());
+      drpRefundGoods.setRefundTime(content.getRefundTime());
       this.baseMapper.insert(drpRefundGoods);
-      Iterator var4 = content.getDetailList().iterator();
+      Iterator<DrpRefundGoodsDetailAddDTO> var4 = content.getDetailList().iterator();
 
       while(var4.hasNext()) {
-         DrpRefundGoodsDetailAddDTO drpRefundGoodsDetailAddDTO = (DrpRefundGoodsDetailAddDTO)var4.next();
+         DrpRefundGoodsDetailAddDTO drpRefundGoodsDetailAddDTO = var4.next();
          DrpRefundGoodsDetail drpRefundGoodsDetail = new DrpRefundGoodsDetail();
          BeanUtil.copyProperties(drpRefundGoodsDetailAddDTO, drpRefundGoodsDetail, new String[0]);
          drpRefundGoodsDetail.setRefundDetailId(Id.next());
@@ -70,11 +71,12 @@ public class DrpRefundGoodsServiceImpl extends ServiceImpl<DrpRefundGoodsMapper,
       drpOutInventoryAddDTO.setTotalNum(content.getRefundTotalNum());
       drpOutInventoryAddDTO.setOutType(DrpOutInventoryTypeEnum.BACK.key());
       drpOutInventoryAddDTO.setRemark("退货出库");
-      List<DrpOutDetailAddDTO> outDetailList = new ArrayList();
-      Iterator var11 = content.getDetailList().iterator();
+      List<DrpOutDetailAddDTO> outDetailList = new ArrayList<>();
+      Iterator<DrpRefundGoodsDetailAddDTO> var11 = content.getDetailList().iterator();
 
       while(var11.hasNext()) {
-         DrpRefundGoodsDetailAddDTO drpRefundGoodsDetailAddDTO = (DrpRefundGoodsDetailAddDTO)var11.next();
+
+         DrpRefundGoodsDetailAddDTO drpRefundGoodsDetailAddDTO = var11.next();
          DrpOutDetailAddDTO drpOutDetailAddDTO = new DrpOutDetailAddDTO();
          BeanUtil.copyProperties(drpRefundGoodsDetailAddDTO, drpOutDetailAddDTO, new String[0]);
          drpOutDetailAddDTO.setFetchNum(drpRefundGoodsDetailAddDTO.getRefundNum());