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

product/src/main/java/com/caimei/module/product/dao/ProductModuleDao.java

@@ -6,6 +6,7 @@ import com.caimei.module.base.entity.vo.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -82,4 +83,7 @@ public interface ProductModuleDao {
 
     void updatSecondHnadproductSold(Integer productID);
 
+    List<SeconHandProduct> getSecondHandProductListByMaturity(@Param("beforeDays")Date beforeDays);
+
+    void updateProductValidFlag(@Param("productID")Integer productID, @Param("validFlag")String validFlag);
 }

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

@@ -212,6 +212,11 @@
     <update id="updatSecondHnadproductSold">
         UPDATE cm_second_hand_detail SET sold =  1 where productID = #{productID}
     </update>
+
+    <update id="updateProductValidFlag">
+            UPDATE product SET validFlag = #{validFlag} where productID = #{productID}
+    </update>
+
     <insert id="insertSearchHistory" keyColumn="id" keyProperty="id" parameterType="com.caimei.module.base.entity.vo.SearchHistoryVo">
         insert into user_search_history
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -442,4 +447,16 @@
         ORDER BY cshd.onLineDate DESC
         limit 10
     </select>
+    <select id="getSecondHandProductListByMaturity"
+            resultType="com.caimei.module.base.entity.po.SeconHandProduct">
+            SELECT
+                *
+            FROM
+                cm_second_hand_detail cshd
+            LEFT JOIN product p ON p.productID = cshd.productID
+            WHERE
+                p.validFlag = 2
+            AND cshd.onLineDate  <![CDATA[  <  ]]>  #{beforeDays}
+
+    </select>
 </mapper>