Merge remote-tracking branch 'origin/master'

admin

2019-07-30 573c491b4a1ba60e12a5678a01c1546c0077c1ee

 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoOrderServiceImpl.java

@@ -193,4 +193,15 @@
      return taoBaoOrderMapper.selectByPrimaryKey(id);

   }



   @Override

   public List<TaoBaoOrder> listBySettlementTime(Long minTime, Long maxTime, int page, int pageSize) {



      return taoBaoOrderMapper.listBySettlementTime(minTime, maxTime, (page - 1) * pageSize, pageSize);

   }



   @Override

   public Long countBySettlementTime(Long minTime, Long maxTime) {

      return taoBaoOrderMapper.countBySettlementTime(minTime, maxTime);

   }



}