优化订单状态

yami-shop-service/src/main/java/com/yami/shop/service/impl/ProductServiceImpl.java

@@ -263,7 +263,6 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
         for (SearchProdDto searchProdDto : searchProdDtoPage.getRecords()) {
             List<Sku> skus = skuMapper.listByProdId(searchProdDto.getProdId());
             List<SkuDto> skuList = new ArrayList<>();
-            //TODO wangjian 查询具体的价格
             skus.forEach(sku -> {
                 SkuDto skuDto = new SkuDto();
                 skuDto.setSkuName(sku.getSkuName());

yami-shop-service/src/main/java/com/yami/shop/service/impl/ShopCategoryServiceImpl.java

@@ -158,6 +158,7 @@ public class ShopCategoryServiceImpl extends ServiceImpl<ShopCategoryMapper, Sho
         IPage<ShopCategory> page = page(new Page<>(current, size), new LambdaQueryWrapper<ShopCategory>()
                 .eq(ShopCategory::getShopId, shopId)
                 .eq(ShopCategory::getPid, parentId)
+                .eq(ShopCategory::getIsDelete, 0)
                 .orderByDesc(ShopCategory::getNum)
                 .orderByDesc(ShopCategory::getId));
         Page res = new Page();

yami-shop-service/src/main/resources/mapper/OrderMapper.xml

@@ -541,7 +541,7 @@
             AND
             <choose>
                 <when test="20 == status">
-                    temp.hb_order_status IN (1,20,30,40)
+                    temp.hb_order_status IN (1,20,30,40,70)
                 </when>
                 <otherwise>
                     temp.hb_order_status = #{status}

yami-shop-service/src/main/resources/mapper/ProductMapper.xml

@@ -125,7 +125,7 @@
     </update>
 
     <select id="getProductByProdNameAndShopId" resultType="com.yami.shop.bean.model.Product">
-        select * from tz_prod where prod_name = #{prodName} and shop_id = #{shopId}
+        select * from tz_prod where prod_name = #{prodName} and shop_id = #{shopId} and p.`is_delete`=0
     </select>
 
     <select id="doGetById" resultType="com.yami.shop.bean.model.Product">
@@ -165,7 +165,7 @@
                  LEFT JOIN tz_shop_sku AS tss ON tp.prod_id = tss.spu_id
                  LEFT JOIN tz_channel_shop AS tcs ON tss.shop_id = tcs.shop_id
         WHERE tp.prod_id = #{prodId}
-          AND tcs.channel_id = #{platform}
+          AND tcs.channel_id = #{platform} and p.`is_delete`=0
         GROUP BY
             tp.prod_id,
             tcs.shop_id
@@ -189,7 +189,7 @@
         LEFT JOIN tz_prod_tag pt
         ON pt.`id` = ptr.`tag_id`
         WHERE pt.`id` = #{tagId}
-        AND p.status = 1
+        AND p.status = 1 and p.`is_delete`=0
         ORDER BY p.`update_time` DESC
     </select>
 
@@ -197,7 +197,7 @@
         SELECT
         <include refid="prodWithNoContent_SQL"/>
         FROM tz_prod p
-        WHERE p.`status` = 1 AND p.prod_type =0
+        WHERE p.`status` = 1 AND p.prod_type =0 and p.`is_delete`=0
         ORDER BY p.putaway_time DESC
     </select>
 
@@ -205,7 +205,7 @@
         SELECT p.*
         FROM tz_prod p
         WHERE p.`status` = 1
-            and p.prod_type = 3
+            and p.prod_type = 3 and p.`is_delete`=0
         ORDER BY p.putaway_time DESC
     </select>
 
@@ -257,7 +257,7 @@
         from
         tz_prod p
         left join tz_prod_comm pc on p.prod_id=pc.prod_id and pc.`status`=1
-        where 1 = 1 and p.`status` = 1
+        where 1 = 1 and p.`status` = 1 and p.`is_delete`=0
         <if test="searchParam.prodName != null and searchParam.prodName != ''">
             and prod_name like concat('%',#{searchParam.prodName} ,'%')
         </if>
@@ -303,7 +303,7 @@
         SELECT
         <include refid="prodWithNoContent_SQL"/>
         FROM tz_prod p
-        WHERE p.`status` = 1
+        WHERE p.`status` = 1 and p.`is_delete`=0
         <if test="shopId != 0">
             AND p.shop_id = #{shopId}
         </if>
@@ -314,7 +314,7 @@
         <include refid="prodWithNoContent_SQL"/>
         FROM
         tz_prod p
-        WHERE p.`status` = 1
+        WHERE p.`status` = 1 and p.`is_delete`=0
         <if test="shopId != 0">
         AND p.shop_id = #{shopId}
         </if>
@@ -337,7 +337,7 @@
         SELECT
         <include refid="prodWithNoContent_SQL"/>
         FROM tz_prod p
-        WHERE p.`prod_id` IN
+        WHERE  p.`is_delete`=0 p.`prod_id` IN
         (SELECT uc.`prod_id` FROM tz_user_collection uc
         WHERE uc.user_id = #{userId})
     </select>
@@ -363,7 +363,7 @@
         FROM
         tz_prod p
         LEFT JOIN tz_sku s ON s.`prod_id` = p.`prod_id`
-        WHERE p.`prod_id` IN
+        WHERE  p.`is_delete`=0 p.`prod_id` IN
         <foreach collection="prodIds" item="prodId" open="(" close=")" separator=",">
             #{prodId}
         </foreach>
@@ -429,7 +429,7 @@
         LEFT JOIN tz_shop_detail s
         ON p.shop_id = s.shop_id
         <where>
-            p.status != -1 AND prod_type = 0
+            p.status != -1 AND prod_type = 0 and p.`is_delete`=0
             <if test="product.status != null">
                 AND p.status = #{product.status}
             </if>
@@ -466,7 +466,7 @@
             tz_category tc ON tc.`category_id` = p.`category_id`
         LEFT JOIN
             tz_category stc ON stc.`category_id` = p.`shop_category_id`
-        WHERE s.`is_delete` = 0 AND p.`status` = #{productParam.status} AND p.shop_id = #{productParam.shopId}
+        WHERE s.`is_delete` = 0 and p.`is_delete`=0 AND p.`status` = #{productParam.status} AND p.shop_id = #{productParam.shopId}
     </select>
 
     <select id="pageProducts" resultType="com.yami.shop.bean.model.Product">
@@ -477,7 +477,7 @@
         FROM
             tz_prod p
         <where>
-            shop_id = #{product.shopId} and  STATUS = 1 AND prod_type = 0
+            shop_id = #{product.shopId} and  STATUS = 1 AND prod_type = 0 and p.`is_delete`=0
             <if test="product.prodName != null">
                 AND p.prod_name LIKE concat('%',#{product.prodName},'%')
             </if>
@@ -503,7 +503,7 @@
         from
         tz_prod p
         left join tz_prod_comm pc on p.prod_id=pc.prod_id and pc.`status`=1
-        where 1 = 1 and p.`status` = 1 and prod_type = 0
+        where 1 = 1 and p.`status` = 1 and prod_type = 0 and p.`is_delete`=0
 
         <if test="searchParam.prodName != null and searchParam.prodName != ''">
             and prod_name like concat('%',#{searchParam.prodName} ,'%')
@@ -581,7 +581,7 @@
             p.status
         FROM tz_prod p
         left join tz_shop_detail sd on p.shop_id = sd.shop_id
-        WHERE p.`status` = 1 AND p.prod_type =0
+        WHERE p.`status` = 1 AND p.prod_type =0 and p.`is_delete`=0
         <if test="list != null">
             and p.shop_id in
             <foreach collection="list" item="item" separator="," open="(" close=")">
@@ -612,7 +612,7 @@
         LEFT JOIN tz_shop_detail sd ON sd.shop_id = tss.shop_id
         LEFT JOIN tz_prod_comm pc ON p.prod_id = pc.prod_id
         LEFT JOIN tz_channel_prod tcp ON tss.sku_id = tcp.sku_id
-        where 1 = 1 and p.`status` = 1 and tcp.is_delete=0 and tss.shop_id in
+        where 1 = 1 and p.`status` = 1 and p.`is_delete`=0 and tcp.is_delete=0 and tss.shop_id in
         <foreach collection="list" item="item" separator="," open="(" close=")">
             #{item}
         </foreach>
@@ -684,7 +684,7 @@
         tz_prod p
         WHERE
         1 = 1
-        AND p.`status` = 1
+        AND p.`status` = 1 and p.`is_delete`=0
         <if test="searchParam.prodName != null and searchParam.prodName != ''">
             AND prod_name LIKE CONCAT('%', #{searchParam.prodName}, '%')
         </if>
@@ -769,7 +769,7 @@
                 INNER JOIN tz_category c ON p.shop_category_id = c.category_id
         WHERE
             c.parent_id = #{prodByCategoryIdAndShopIdDTO.categoryId}
-          AND p.STATUS = 1
+          AND p.STATUS = 1 and p.`is_delete`=0
           AND c.STATUS = 1
           AND  p.shop_id = #{prodByCategoryIdAndShopIdDTO.shopId}
         ORDER BY
@@ -816,7 +816,7 @@
                 LEFT JOIN tz_shop_sku tss ON  tss.spu_id=tcp.prod_id
                 LEFT JOIN tz_channel_prod cp ON  (cp.shop_id=tsc.shop_id AND cp.sku_id=tss.sku_id)
         WHERE
-            tp.STATUS = 1
+            tp.STATUS = 1 and tp.`is_delete`=0
           AND tcp.is_delete = 0
           AND tsc.is_delete = 0
           AND cp.channel_prod_price IS NOT NULL