Merge branch 'test' into 'master'

罗yu 元桥

2021-05-08 2eea3290641657d2ee13edd90d27f8b2ec01c209

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ShopApi.java

@@ -329,7 +329,7 @@
     */
    @PostMapping("orderCancel")
    public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
        return comShopOrderService.orderCancel(comShopOrderQueryDTO.getOrderId(),comShopOrderQueryDTO.getPhone());
        return comShopOrderService.orderCancel(comShopOrderQueryDTO);
    }

    /**
@@ -444,8 +444,7 @@
     */
    @PostMapping("/deliverOrder")
    R deliverOrder(@RequestBody  ComShopOrderDeliverDTO deliverDTO){
        Long orderId = deliverDTO.getOrderId();
        return comShopOrderService.deliverOrder(orderId);
        return comShopOrderService.deliverOrder(deliverDTO);
    }
    /**
     * 订单配送
@@ -454,8 +453,7 @@
     */
    @PostMapping("/finishDeliverOrder")
    R finishDeliverOrder(@RequestBody ComShopOrderDeliverDTO deliverDTO){
        Long orderId = deliverDTO.getOrderId();
        return comShopOrderService.finishDeliverOrder(orderId);
        return comShopOrderService.finishDeliverOrder(deliverDTO);
    }

    /**