Merge remote-tracking branch 'origin/developerC' into developerB

# Conflicts:
#	src/main/resources/mapper/SearchMapper.xml

src/main/resources/mapper/SearchMapper.xml

@@ -31,7 +31,7 @@
         p.validFlag as p_valid,
         DATE_FORMAT(p.ADDTIME,'%Y%m%d') as p_time,
         IFNULL(p.visibility,3) as p_visibility,
-        p.price8Text as p_act_flag
+        IFNULL(p.price8Text,0) as p_act_flag
     </sql>
     <sql id="Product_Joins">
         left join tinytype as t on p.tinyTypeID = t.tinyTypeID
@@ -42,7 +42,7 @@
         left join shop as sh on p.shopID = sh.shopID
     </sql>
     <select id="searchProductById" resultType="com.caimei365.commodity.model.search.ProductDO">
-        select<include refid="Search_Product_List"/>, p.productCategory
+        select <include refid="Search_Product_List"/>, p.productCategory
         from product p
         <include refid="Product_Joins"/>
         where p.validFlag in (2,3,9) and p.productCategory = 1
@@ -299,7 +299,7 @@
         p.price1 as price,
         p.shopID as shopId,
         p.searchKey as keyword,
-        p.price8Text as beautyActFlag
+        IFNULL(p.price8Text,0) as beautyActFlag
         from product p
         left join cm_brand as br on p.brandID = br.id
         where p.productCategory = 1

src/main/resources/mapper/SecondHandMapper.xml

@@ -198,7 +198,7 @@
         from product p
         left join cm_second_hand_recommend cshr on p.productID = cshr.recommendProductID
         left join cm_brand cb on cb.id = p.brandID
-        where p.productCategory = 2 and p.validFlag = 2 and cshr.delFlag = 0
+        where p.validFlag = 2 and cshr.delFlag = 0
         and cshr.secondHandProductID = #{productId}
         order by cshr.sort desc
     </select>