| | |
| | | * @return 订单详情 |
| | | */ |
| | | @GetMapping("orderDetail") |
| | | public R orderDetailFlower(@RequestParam("orderId") Long orderId) { |
| | | return comShopFlowerOrderService.orderDetail(orderId); |
| | | public R orderDetailFlower(@RequestParam("orderId") Long orderId,@RequestParam(value = "phone",required = false) String phone) { |
| | | return comShopFlowerOrderService.orderDetail(orderId,phone); |
| | | } |
| | | |
| | | /** |
| | |
| | | * @return |
| | | */ |
| | | @GetMapping("selectOrderLineChart") |
| | | public R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type") Integer type){ |
| | | return comShopFlowerOrderService.selectOrderLineChart(storeId,type); |
| | | public R selectOrderLineChart(@RequestParam("storeId") Long storeId,@RequestParam("type") Integer type,@RequestParam("tab") Integer tab){ |
| | | return comShopFlowerOrderService.selectOrderLineChart(storeId,type,tab); |
| | | } |
| | | |
| | | /** |
| | |
| | | return comShopFlowerRefundOrderService.refundOrderDetail(id); |
| | | } |
| | | |
| | | /** |
| | | * 清点商品 确认送达详情 |
| | | * @param pageComFlowerOrderListDTO |
| | | * @return |
| | | */ |
| | | @PostMapping("pageOrderByDeliveryNo") |
| | | public R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO){ |
| | | return comShopFlowerOrderService.pageOrderByDeliveryNo(pageComFlowerOrderListDTO); |
| | | } |
| | | |
| | | /** |
| | | * 统计上架的上下架商品数量 |
| | | * @param userId |
| | | * @return |
| | | */ |
| | | @GetMapping("/countSaleByUserId") |
| | | R countSaleByUserId(@RequestParam("userId") Long userId){ |
| | | return comShopFlowerGoodsService.countSaleByUserId(userId); |
| | | } |
| | | |
| | | } |