Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-26 8da7ca5f5a5466c76b0d0abe23c7935e13e09136

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComShopFlowerOrderDAO.java

@@ -81,8 +81,29 @@

    /**
     * 获取商家可结算额度 15天以前的完成的订单
     *
     * @param storeId
     * @return
     */
    BigDecimal selectSettlement(@Param("storeId") Long storeId);

    List<ComShopOrderStoreIdNumVO> selectSumOrderAndAmountByStoreId(@Param("storeId") Long storeId);

    /**
     * 查询近15天的订单量
     *
     * @param storeId
     * @return
     */
    List<ComShopOrderStoreIdCountVO> selectCountOrderDayByStoreId(@Param("storeId") Long storeId, @Param("days") Integer days);

    /**
     * 查询当年月份的订单量
     *
     * @param storeId
     * @return
     */
    List<ComShopOrderStoreIdCountVO> selectCountOrderMonthByStoreId(@Param("storeId") Long storeId);

    IPage<ComShopFlowerOrderStoreListVO> pageOrderByDeliveryNo(@Param("page") Page page, @Param("comOrderListDTO") PageComFlowerOrderListDTO comOrderListDTO);
}