Merge remote-tracking branch 'origin/send_coupon' into user_action

peng

1 天以前 672637fa4a4914ec9667cb15f70b67482b8a0e5e

 framework/src/main/java/cn/lili/modules/order/order/mapper/OrderMapper.java

@@ -206,4 +206,18 @@
            "  ORDER BY " +
            "  day ASC")
    List<Map<String, Object>>  selectOrderCountByDay(Date startTime, Date endTime);

    @Select("SELECT " +
            "  DATE(create_time) AS day, " +
            "  HOUR(create_time) AS hour," +
            "  COUNT(*) AS count " +
            "  FROM" +
            "  li_order o" +
            "  WHERE " +
            "  o.create_time BETWEEN #{startTime} AND #{endTime} " +
            "  GROUP BY" +
            "  day " +
            "  ORDER BY " +
            "  day , hour ASC")
    List<Map<String, Object>>  selectOrderTimePeriod(Date startTime, Date endTime);
}