| | |
| | | import com.panzhihua.common.model.dtos.shop.*; |
| | | import com.panzhihua.common.model.vos.LoginUserInfoVO; |
| | | import com.panzhihua.common.model.vos.R; |
| | | import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointOrderVO; |
| | | import com.panzhihua.common.model.vos.community.convenient.ConvenientElevatingPointVO; |
| | | import com.panzhihua.common.model.vos.community.convenient.ConvenientMerchantVO; |
| | | import com.panzhihua.common.model.vos.community.convenient.ConvenientServiceCategoryVO; |
| | |
| | | * @param pageComFlowerOrderListDTO |
| | | * @return |
| | | */ |
| | | @ApiOperation(value = "未配送-开始配送-订单列表", response = ComShopFlowerOrderPageVO.class) |
| | | @ApiOperation(value = "未配送-开始配送-订单列表", response = ConvenientElevatingPointOrderVO.class) |
| | | @PostMapping("pageNoDeliveryOrderList") |
| | | public R pageNoDeliveryOrderList(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO) { |
| | | return communityService.pageNoDeliveryOrderList(pageComFlowerOrderListDTO); |
| | |
| | | return communityService.refundOrderDetail(id); |
| | | } |
| | | |
| | | /** |
| | | * 清点商品 确认送达详情 |
| | | * @param pageComFlowerOrderListDTO |
| | | * @return |
| | | */ |
| | | @PostMapping("pageOrderByDeliveryNo") |
| | | @ApiOperation(value = "清点商品 确认送达详情",response = ComShopFlowerOrderDeliveryNoListVO.class) |
| | | public R pageOrderByDeliveryNo(@RequestBody PageComFlowerOrderListDTO pageComFlowerOrderListDTO){ |
| | | return communityService.pageOrderByDeliveryNo(pageComFlowerOrderListDTO); |
| | | } |
| | | |
| | | |
| | | /** |
| | | * 订单发货 |
| | | * |
| | | * @param orderShipDTO 发货信息 |
| | | * @return 发货结果 |
| | | */ |
| | | @PostMapping("/shipOrderFlower") |
| | | @ApiOperation(value = "订单发货") |
| | | public R shipOrderFlower(@RequestBody ComShopOrderShipDTO orderShipDTO) { |
| | | return communityService.shipOrderFlower(orderShipDTO); |
| | | } |
| | | } |