Merge branch 'feature/eccs-upgrade' of lvjian/eccs into feature/eccs-upgrade

eccs-biz/src/main/resources/mapper/biz/mall/InventoryDataMapper.xml

@@ -44,6 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             t.is_valid = '0'
             AND t2.inve_status = '0'
             AND t2.is_valid = '0'
+            AND t1.is_delete = '0'
         </where>
         <if test="pageIndex != null and pageSize != null">
             limit #{pageIndex}, #{pageSize}
@@ -62,6 +63,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             t.is_valid = '0'
             AND t2.inve_status = '0'
             AND t2.is_valid = '0'
+            AND t1.is_delete = '0'
         </where>
     </select>
 

eccs-biz/src/main/resources/mapper/biz/mall/MallGoodsMapper.xml

@@ -37,6 +37,7 @@
             mall_goods t1
             LEFT JOIN merchant_base t2 ON t1.merch_sn = t2.merch_sn
         <where>
+            t1.is_delete = '0'
             <if test="merchSn != null  and merchSn != ''"> and t1.merch_sn = #{merchSn}</if>
             <if test="sku != null  and sku != ''"> and t1.sku = #{sku}</if>
             <if test="plu != null  and plu != ''"> and t1.PLU = #{plu}</if>