Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panz...

lidongdong

2022-12-06 2a212f983f35e1c569dfec3a172fb5f0c9f85fac

 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取消订单
@@ -88,24 +88,6 @@
    R orderConfirm(Long orderId, String phone);

    /**
     * 统计用户订单数量
     * 
     * @param userId
     *            用户id
     * @return 统计结果
     */
    R orderStatistics(Long userId);

    /**
     * 商家资金的订单详情
     * 
     * @param id
     *            订单id
     * @return
     */
    R capitalDetailByStore(Long id);

    /**
     * 订单发货
     * 
     * @param orderShipDTO
@@ -132,41 +114,6 @@
     */
    R finishDeliverOrder(ComShopOrderDeliverDTO orderDeliverDTO);

    /**
     * 获取订单导出数据
     * 
     * @param comShopOrderExportDTO
     *            订单导出参数
     * @return 订单数据
     */
    R shopOrderExportData(ComShopOrderExportDTO comShopOrderExportDTO);

    /**
     * 获取资金导出数据
     * 
     * @param comShopFundsExportDTO
     *            资金导出参数
     * @return 资金数据
     */
    R shopOrderFundsExportData(ComShopFundsExportDTO comShopFundsExportDTO);

    /**
     * 获取用户资金信息
     * 
     * @param userId
     *            用户ID
     * @return 统计结果
     */
    R getFundsStat(Long userId);

    /**
     * 获取分页 资金订单数据
     * 
     * @param pageComShopFundsSearchDTO
     *            资金导出参数
     * @return 资金订单数据
     */
    R pageShopFunds(PageComShopFundsSearchDTO pageComShopFundsSearchDTO);

    /**
     * 微信支付订单回调
@@ -197,12 +144,43 @@
     * @param deliveryType
     * @return
     */
    R selectCountByDeliveryType(Integer deliveryType,Long storeId);
    R selectCountByDeliveryType(Integer deliveryType,Long userId);

    /**
     * 查询我的店铺各类统计数据
     * @param storeId
     * @return
     */
    R selectCountByStoreId(Long storeId);
    R selectCountByUserId(Long storeId);

    /**
     * 获取商家的营业额和可结算金额
     * @param storeId
     * @return
     */
    R getQuota(Long storeId);

    /**
     * 商家后台经营数据统计-上
     * @param storeId
     * @return
     */
    R selectSumOrderAndAmountByStoreId(Long storeId);

    /**
     * 统计时间区域的订单量 15天 30天 一年
     * @param storeId
     * @param type
     * @param tab
     * @return
     */
    R selectOrderLineChart(Long storeId,Integer type,Integer tab);

    /**
     * 清点商品 确认送达详情
     * @param pageComFlowerOrderListDTO
     * @return
     */
    R pageOrderByDeliveryNo(PageComFlowerOrderListDTO pageComFlowerOrderListDTO);

}