From 297734ace4c05848b28a792fa89f38bee67be3c1 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 28 二月 2026 09:41:34 +0800
Subject: [PATCH] 合并

---
 server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
index ecb5f69..05486e9 100644
--- a/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
+++ b/server/dmmall_service/src/main/java/com/doumee/service/business/impl/GoodsServiceImpl.java
@@ -354,7 +354,23 @@
                     .set(Goods::getEditor,user.getId())
                     .set(Goods::getStatus,Constants.ONE )
                     .in(Goods::getId,idList));
+
+            //鎵归噺涓嬫灦 sku鏁版嵁
+            goodsSkuMapper.update(null,new UpdateWrapper<GoodsSku>().lambda()
+                    .set(GoodsSku::getEditDate,new Date() )
+                    .set(GoodsSku::getEditor,user.getId())
+                    .set(GoodsSku::getStatus,Constants.ONE )
+                    .eq(GoodsSku::getIsdeleted,Constants.ZERO)
+                    .in(GoodsSku::getGoodsId,idList));
             return;
+        }else{
+            //鎵归噺涓婃灦 sku鏁版嵁
+            goodsSkuMapper.update(null,new UpdateWrapper<GoodsSku>().lambda()
+                    .set(GoodsSku::getEditDate,new Date() )
+                    .set(GoodsSku::getEditor,user.getId())
+                    .set(GoodsSku::getStatus,Constants.ZERO )
+                    .eq(GoodsSku::getIsdeleted,Constants.ZERO)
+                    .in(GoodsSku::getGoodsId,idList));
         }
         long shopNum   = shopMapper.selectCount(new QueryWrapper<Shop>().lambda()
                 .eq(Shop::getIsdeleted,Constants.ZERO)
@@ -658,6 +674,7 @@
         }
         Multifile find = new Multifile();
         find.setObjId(id);
+        find.setObjType(Constants.MultiFile.PLATFORM_GOOD_ROTATION.getKey());
         find.setIsdeleted(Constants.ZERO);
         List<Multifile> fileList=  multifileMapper.selectList(new QueryWrapper<>(find));
         goods.setFileList(fileList);
@@ -860,6 +877,7 @@
                     " INNER JOIN goods g on  g.id=gs.GOODS_ID " +
                     " where gs.STOCK<=0 and gs.ISDELETED=0 and g.id=t.id ");
         }
+
         queryWrapper.eq(!Constants.equalsInteger(pageWrap.getModel().getTabStatus(), 3), Goods::getIsdeleted, Constants.ZERO);
         queryWrapper.eq(Constants.equalsInteger(pageWrap.getModel().getTabStatus(), 3), Goods::getIsdeleted, Constants.ONE);
 

--
Gitblit v1.9.3