From 99f77c0fd2ee8ed8840be5e5f99309b184a09e9f Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 11:27:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
index 407ddf5..0b87604 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/GoodsorderServiceImpl.java
@@ -747,8 +747,10 @@
             Date date = new Date();
             list.forEach(s->{
                 try {
-                    goodsorder.setEditDate(date);
-                    goodsorder.setEditor(null);
+                    s.setEditDate(date);
+                    s.setEditor(null);
+                    s.setCloseDate(date);
+
                     closeGoodsorder(s,Constants.REFUND_TYPE.PLAT_AUTO.getKey());
                 }catch (BusinessException e){
 

--
Gitblit v1.9.3