Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-07-19 4c31405418bdd063605f1e5821d99f85be02f23c

 fanli/src/main/java/com/yeshi/fanli/mapping/taobao/TaoBaoOrderMapper.xml

@@ -115,6 +115,38 @@
         where to_order_id=#{orderNo}
      </if>
   </select>
	
   <select id="listBySettlementTime" resultMap="BaseResultMap">
      select * from yeshi_ec_taobao_order
      where 1=1
		
      <if test="minTime!=null">
        and UNIX_TIMESTAMP(to_settlement_time)*1000>=#{minTime}
      </if>
		
      <if test="maxTime!=null">
        and #{maxTime}>UNIX_TIMESTAMP(to_settlement_time)*1000
      </if>
		
      order by to_settlement_time desc
      limit #{start},#{count}
   </select>
	
	
   <select id="countBySettlementTime" resultType="java.lang.Long">
      select count(to_id) from yeshi_ec_taobao_order
      where 1=1
		
      <if test="minTime!=null">
        and UNIX_TIMESTAMP(to_settlement_time)*1000>=#{minTime}
      </if>
		
      <if test="maxTime!=null">
        and #{maxTime}>UNIX_TIMESTAMP(to_settlement_time)*1000
      </if>
		
   </select>
	

   <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">delete from
      yeshi_ec_taobao_order where to_id = #{id,jdbcType=BIGINT}