Merge branches 'developer' and 'developerA' of git.caimei365.com:chao/caimei-modules-soa into developerA

product/src/main/resources/com-caimei-module-product/ProductModuleMapper.xml

@@ -392,6 +392,7 @@
         <if test="instrumentType != null and instrumentType != '' and instrumentType != '0'  and instrumentType != 0">
             and cshd.instrumentType like CONCAT('%',#{instrumentType},'%')
         </if>
+        and cshd.sold != 1
         ORDER BY cshd.onLineDate DESC
     </select>
     <select id="getSencondHandProductDetail" resultType="com.caimei.module.base.entity.po.SeconHandProduct">
@@ -432,6 +433,7 @@
             <if test="searchKeyword != null and searchKeyword != ''">
             and p.name like CONCAT('%',#{searchKeyword},'%')
             </if>
+            and cshd.sold != 1
             ORDER BY cshd.onLineDate DESC
     </select>
     <select id="getSeconHandProductByLimit" resultType="com.caimei.module.base.entity.po.SeconHandProduct">