Merge branch 'local_20221104' into huacheng_test

yanghui

2022-12-01 0ab77d6e1b6102b1fd14a134a9acb6d173f40d2b

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopFlowerOrderService.java

@@ -56,7 +56,7 @@
     *            订单id
     * @return 订单详情
     */
    R orderDetail(Long orderId);
    R orderDetail(Long orderId,String phone);

    /**
     * 根据订单id取消订单
@@ -171,9 +171,10 @@
     * 统计时间区域的订单量 15天 30天 一年
     * @param storeId
     * @param type
     * @param tab
     * @return
     */
    R selectOrderLineChart(Long storeId,Integer type);
    R selectOrderLineChart(Long storeId,Integer type,Integer tab);

    /**
     * 清点商品 确认送达详情