From 41ef2769f79fa84de55a4c49aa839139fbf15b97 Mon Sep 17 00:00:00 2001
From: zhangxinqi <m15726637040@163.com>
Date: Thu, 9 Jun 2022 00:46:34 +0800
Subject: [PATCH] 代码永远再路上

---
 soss-system/src/main/java/com/soss/system/service/impl/GoodsServiceImpl.java |  9 +++++----
 soss-system/src/main/java/com/soss/system/service/impl/ShopServiceImpl.java  |  1 -
 soss-system/src/main/resources/mapper/system/GoodsMapper.xml                 |  1 +
 soss-system/src/main/resources/mapper/system/GoodsSkuMapper.xml              |  4 +++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/soss-system/src/main/java/com/soss/system/service/impl/GoodsServiceImpl.java b/soss-system/src/main/java/com/soss/system/service/impl/GoodsServiceImpl.java
index 29589de..01b1390 100644
--- a/soss-system/src/main/java/com/soss/system/service/impl/GoodsServiceImpl.java
+++ b/soss-system/src/main/java/com/soss/system/service/impl/GoodsServiceImpl.java
@@ -1,10 +1,7 @@
 package com.soss.system.service.impl;
 
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import com.alibaba.fastjson.JSONArray;
@@ -46,6 +43,8 @@ public class GoodsServiceImpl implements IGoodsService
     private OrderMapper orderMapper;
     @Autowired
     private GoodsCategoryMapper goodsCategoryMapper;
+    @Autowired
+    private ShopRecommendMapper shopRecommendMapper;
 
 
     /**
@@ -305,6 +304,8 @@ public class GoodsServiceImpl implements IGoodsService
         for (ShopGoods shopGoods1 : shopGoodsList) {
             shopGoodsMapper.deleteShopGoodsById(shopGoods1.getId());
             shopGoodsSkuMapper.deleteShopGoodsSkuByGoodsId(shopGoods1.getGoodsId());
+            List<String> goodsIds = Arrays.asList(String.valueOf(shopGoods1.getGoodsId()));
+            shopRecommendMapper.deleteByShopIdGoods(shopGoods1.getShopId(),goodsIds);
         }
 
         return i+"";
diff --git a/soss-system/src/main/java/com/soss/system/service/impl/ShopServiceImpl.java b/soss-system/src/main/java/com/soss/system/service/impl/ShopServiceImpl.java
index de5203c..f05fa9b 100644
--- a/soss-system/src/main/java/com/soss/system/service/impl/ShopServiceImpl.java
+++ b/soss-system/src/main/java/com/soss/system/service/impl/ShopServiceImpl.java
@@ -128,7 +128,6 @@ public class ShopServiceImpl implements IShopService
         for (String id : ids) {
             Shop shop = new Shop();
             shop.setId(Long.parseLong(id));
-            shop.setIsDefault(1L);
             shop.setState("3");
             shopMapper.updateShop(shop);
         }
diff --git a/soss-system/src/main/resources/mapper/system/GoodsMapper.xml b/soss-system/src/main/resources/mapper/system/GoodsMapper.xml
index 8b9f230..22fa123 100644
--- a/soss-system/src/main/resources/mapper/system/GoodsMapper.xml
+++ b/soss-system/src/main/resources/mapper/system/GoodsMapper.xml
@@ -47,6 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="code != null  and code != ''"> and code = #{code}</if>
 
         </where>
+        order by created_at desc
     </select>
     
     <select id="selectGoodsById" parameterType="String" resultMap="GoodsResult">
diff --git a/soss-system/src/main/resources/mapper/system/GoodsSkuMapper.xml b/soss-system/src/main/resources/mapper/system/GoodsSkuMapper.xml
index b32b30b..72efde6 100644
--- a/soss-system/src/main/resources/mapper/system/GoodsSkuMapper.xml
+++ b/soss-system/src/main/resources/mapper/system/GoodsSkuMapper.xml
@@ -88,6 +88,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
     <select id="selectSpec" resultMap="GoodsSkuResult">
         <include refid="selectGoodsSkuVo"/>
-        where rule_list like concat('%',#{query},'%')
+        where
+        is_deleted ='0' and
+        rule_list like concat('%',#{query},'%')
     </select>
 </mapper>
\ No newline at end of file
--
libgit2 0.26.0