用户自定义界面设置+ 免打扰IOS推送修改

yujian

2019-01-17 0a3b28bcff870dfb742d76d06fc74481965ea122

 fanli/src/main/java/com/yeshi/fanli/service/impl/count/CommonOrderCountServiceImpl.java

@@ -147,12 +147,14 @@
      

      List<Map<String, Object>> result_list = null;

      

      // 用户订单

      List<Map<String, Object>> listTotal = commonOrderCountMapper.countOrderNumber(dateType, year,

            startTime, endTime);

      if (listTotal == null || listTotal.size() == 0) {

         return result_list;

      } 

      

      // 淘宝联盟

      List<Map<String, Object>> type_list = taoBaoOrderMapper.countOrderNumber(dateType, year, 

            startTime, endTime);