From c2931ed46d16d6e01baac76c9ab97bb8b7788abf Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期三, 25 十月 2023 17:32:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
index 6221a8c..6e44892 100644
--- a/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/BaseGoodsTemplateServiceImpl.java
@@ -242,4 +242,28 @@
         }
         return tempGoodsInfo.get(0);
     }
+
+    /**
+     * 淇敼鐘舵��
+     * @author 鍗㈠簡闃�
+     * @date 2023/10/25
+     */
+    public int updateStatus(BaseGoodsTemplate goodsTemplate) {
+        return this.update(goodsTemplate);
+    }
+
+    /**
+     * @Description 鏍规嵁鐗╁搧id鍒犻櫎鐗╁搧
+     * @Author 鍗㈠簡闃�
+     * @Date 2023/10/25
+     */
+    public int updateById(BaseGoodsTemplate goodsTemplate, S_user_core currentUser) {
+        goodsTemplate.setStates(Constants.STATES_DELETED);
+        //鍒犻櫎鏃堕棿
+        goodsTemplate.setDTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
+        //鍒犻櫎浜篿d鍜屽垹闄や汉濮撳悕
+        goodsTemplate.setDUserId(currentUser.getId());
+        goodsTemplate.setDUserName(currentUser.getUser_name());
+        return this.update(goodsTemplate);
+    }
 }

--
Gitblit v1.9.1