修改bug

huanghongfa

2021-05-28 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6

 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);

    /**
     * 获取订单导出数据