Merge branch 'dev' into send_coupon

peng

2 天以前 11079cf5c81a047c3a343581a5cc6001fb4a2ec8

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

@@ -63,7 +63,8 @@
            "o.logistics_time AS logistics_time," +
            "o.complete_time AS complete_time," +
            "o.store_name AS store_name, " +
            "m.nick_name AS nickName" +
            "m.nick_name AS nickName," +
            "o.member_id AS memberId" +
            " FROM li_order o LEFT JOIN li_order_item oi ON oi.order_sn = o.sn " +
            "LEFT JOIN li_member m on m.id = o.member_id " +
            "${ew.customSqlSegment}")
@@ -206,4 +207,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);
}