Merge branch 'master' into hotfix-userCertify

@@ -263,12 +263,12 @@
   <update id="changeSaleStatusOn">
   <update id="changeSaleStatusOn">
     update storage_deposit
     update storage_deposit
     set order_status = 1, lock_flag=0, new_skup = #{newSkup} ,update_time = unix_timestamp(now())
     set order_status = 1, lock_flag=0, new_skup = #{newSkup} ,update_time = unix_timestamp(now())
-    where owner_uid=#{uid} and deposit_code = #{depositCode,jdbcType=VARCHAR} and status=1 and order_status = 0
+    where owner_uid=#{uid} and deposit_code = #{depositCode,jdbcType=VARCHAR} and status=1 and order_status = 0 and del_status=0
   </update>
   </update>
   <update id="changeSaleStatusOff">
   <update id="changeSaleStatusOff">
     update storage_deposit
     update storage_deposit
     set order_status = 0 ,update_time = unix_timestamp(now())
     set order_status = 0 ,update_time = unix_timestamp(now())
-    where owner_uid=#{uid} and new_skup = #{newSkup} and status=1 and order_status = 1
+    where owner_uid=#{uid} and new_skup = #{newSkup} and status=1 and order_status = 1 and del_status=0
   </update>
   </update>
   <select id="queryUserDepositProductCount" resultType="java.lang.Integer" parameterType="java.lang.Integer" >
   <select id="queryUserDepositProductCount" resultType="java.lang.Integer" parameterType="java.lang.Integer" >
     select count(distinct product_id) from storage_deposit
     select count(distinct product_id) from storage_deposit
@@ -317,7 +317,7 @@
     select
     select
     <include refid="Base_Column_List" />
     <include refid="Base_Column_List" />
     from storage_deposit
     from storage_deposit
-    where owner_uid = #{uid} and new_skup =#{skup}
+    where owner_uid = #{uid} and new_skup =#{skup} and del_status=0
   </select>
   </select>
   <update id="sale">
   <update id="sale">
     update storage_deposit set del_status=1,
     update storage_deposit set del_status=1,