Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-26 8da7ca5f5a5466c76b0d0abe23c7935e13e09136

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

@@ -153,7 +153,7 @@
     * @param addressId 收货地址id
     * @return 删除结果
     */
    @PostMapping("shopDelUserAddress")
    @DeleteMapping("shopDelUserAddress")
    public R shopFlowerDelUserAddress(@RequestParam("addressId") Long addressId) {
        return comShopUserAddressService.shopDelUserAddress(addressId);
    }
@@ -197,7 +197,7 @@
     * @param orderId 订单id
     * @return 订单详情
     */
    @PostMapping("orderDetail")
    @GetMapping("orderDetail")
    public R orderDetailFlower(@RequestParam("orderId") Long orderId) {
        return comShopFlowerOrderService.orderDetail(orderId);
    }
@@ -219,7 +219,7 @@
     * @param orderId 订单id
     * @return 删除结果
     */
    @PostMapping("orderDelete")
    @DeleteMapping("orderDelete")
    public R orderDeleteFlower(@RequestParam("orderId") Long orderId) {
        return comShopFlowerOrderService.orderDelete(orderId);
    }
@@ -516,4 +516,56 @@
    }


    /**
     * 商家后台经营数据统计-上
     * @param storeId
     * @return
     */
    @GetMapping("selectSumOrderAndAmountByStoreId")
    public R selectSumOrderAndAmountByStoreId(@RequestParam("storeId") Long storeId){
        return comShopFlowerOrderService.selectSumOrderAndAmountByStoreId(storeId);
    }

    /**
     * 统计时间区域的订单量 15天 30天 一年
     * @param storeId
     * @param type
     * @return
     */
    @GetMapping("selectOrderLineChart")
    public  R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type")  Integer type){
        return comShopFlowerOrderService.selectOrderLineChart(storeId,type);
    }

    /**
     * 取消退款
     * @param id
     * @return
     */
    @GetMapping("refundOrderCancel")
    public R refundOrderCancel(@RequestParam("id") Long id){
        return comShopFlowerRefundOrderService.orderCancel(id);
    }

    /**
     * 退款订单详情
     * @param id
     * @return
     */
    @GetMapping("refundOrderDetail")
    public R refundOrderDetail(@RequestParam("id") Long id){
        return comShopFlowerRefundOrderService.refundOrderDetail(id);
    }

    /**
     * 清点商品 确认送达详情
     * @param pageComFlowerOrderListDTO
     * @return
     */
    @PostMapping("pageOrderByDeliveryNo")
    public R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO){
        return comShopFlowerOrderService.pageOrderByDeliveryNo(pageComFlowerOrderListDTO);
    }


}