huanghongfa
2021-08-21 2e64c232ab6b51b2cecf1ee96e1e9b709234f326
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/ComShopOrderService.java
@@ -50,11 +50,10 @@
    /**
     * 根据订单id取消订单
     * @param orderId   订单id
     * @param phone 操作用户手机号
     * @param comShopOrderQueryDTO   订单信息
     * @return  取消结果
     */
    R orderCancel(Long orderId,String phone);
    R orderCancel(ComShopOrderQueryDTO comShopOrderQueryDTO);
    /**
     * 根据订单id删除订单
@@ -94,17 +93,17 @@
    /**
     * 订单配送
     * @param orderId 订单id
     * @param orderDeliverDTO 订单信息
     * @return 配送结果
     */
    R deliverOrder(Long orderId);
    R deliverOrder(ComShopOrderDeliverDTO orderDeliverDTO);
    /**
     * 订单完成配送
     * @param orderId 订单id
     * @param orderDeliverDTO 订单信息
     * @return 完成配送结果
     */
    R finishDeliverOrder(Long orderId);
    R finishDeliverOrder(ComShopOrderDeliverDTO orderDeliverDTO);
    /**
     * 获取订单导出数据
@@ -133,4 +132,17 @@
     * @return 资金订单数据
     */
    R pageShopFunds(PageComShopFundsSearchDTO pageComShopFundsSearchDTO);
    /**
     * 微信支付订单回调
     * @param wxPayNotifyOrderDTO   订单支付回调参数
     */
    void wxOrderPayNotify(WxPayNotifyOrderDTO wxPayNotifyOrderDTO);
    /**
     * 用户点击去支付
     * @param orderPayDTO   请求参数
     * @return  返回支付对象
     */
    R wxPay(OrderPayDTO orderPayDTO);
}