Add:添加邻里圈删除

DESKTOP-71BH0QO\L、ming

2021-04-30 6cbbbc92f623c83e918ef0f2eea8ff82cc920b1b

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

@@ -118,6 +118,16 @@
    public R getUserStoreInfo(@RequestParam("userId") Long userId) {
        return comShopStoreService.getUserStoreInfo(userId);
    }
    /**
     * 获取用户商铺详细
     *
     * @param account 用户账号
     * @return
     */
    @GetMapping("/getUserStoreInfoByAccount")
    public R<ShopStoreVO> getUserStoreInfoByAccount(@RequestParam("account") String account) {
        return comShopStoreService.getUserStoreInfo(account);
    }

    /**
     * 添加商城后台日志
@@ -319,7 +329,7 @@
     */
    @PostMapping("orderCancel")
    public R orderCancel(@RequestBody ComShopOrderQueryDTO comShopOrderQueryDTO) {
        return comShopOrderService.orderCancel(comShopOrderQueryDTO.getOrderId(),comShopOrderQueryDTO.getPhone());
        return comShopOrderService.orderCancel(comShopOrderQueryDTO);
    }

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

    /**