|
@@ -6,6 +6,8 @@ import javax.servlet.http.HttpServletResponse;
|
|
|
|
|
|
import com.yiqi.common.constant.UrlConstants;
|
|
|
import com.yiqi.order.domain.OrderDelivery;
|
|
|
+import com.yiqi.order.domain.dto.OrderDeliveryRequestDTO;
|
|
|
+import com.yiqi.order.domain.vo.OrderDeliveryVO;
|
|
|
import com.yiqi.order.service.IOrderDeliveryService;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
@@ -34,7 +36,7 @@ import com.yiqi.common.core.page.TableDataInfo;
|
|
|
*/
|
|
|
@Api(tags = "管理后台 - 订单配送")
|
|
|
@RestController
|
|
|
-@RequestMapping(UrlConstants.managerApi + "/system/delivery")
|
|
|
+@RequestMapping(UrlConstants.managerApi + "/order/delivery")
|
|
|
public class OrderDeliveryController extends BaseController {
|
|
|
@Autowired
|
|
|
private IOrderDeliveryService orderDeliveryService;
|
|
@@ -42,32 +44,32 @@ public class OrderDeliveryController extends BaseController {
|
|
|
/**
|
|
|
* 查询订单配送列表
|
|
|
*/
|
|
|
- @PreAuthorize("@ss.hasPermi('system:delivery:list')")
|
|
|
+ @PreAuthorize("@ss.hasPermi('order:delivery:list')")
|
|
|
@GetMapping("/list")
|
|
|
@ApiOperation(value = "查询订单配送列表")
|
|
|
- public TableDataInfo list(OrderDelivery orderDelivery) {
|
|
|
+ public TableDataInfo list(OrderDeliveryRequestDTO requestDTO) {
|
|
|
startPage();
|
|
|
- List<OrderDelivery> list = orderDeliveryService.selectOrderDeliveryList(orderDelivery);
|
|
|
+ List<OrderDeliveryVO> list = orderDeliveryService.selectOrderDeliveryList(requestDTO);
|
|
|
return getDataTable(list);
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 导出订单配送列表
|
|
|
*/
|
|
|
- @PreAuthorize("@ss.hasPermi('system:delivery:export')")
|
|
|
+ @PreAuthorize("@ss.hasPermi('order:delivery:export')")
|
|
|
@Log(title = "订单配送", businessType = BusinessType.EXPORT)
|
|
|
@PostMapping("/export")
|
|
|
@ApiOperation(value = "导出订单配送列表")
|
|
|
- public void export(HttpServletResponse response, OrderDelivery orderDelivery) {
|
|
|
- List<OrderDelivery> list = orderDeliveryService.selectOrderDeliveryList(orderDelivery);
|
|
|
- ExcelUtil<OrderDelivery> util = new ExcelUtil<OrderDelivery>(OrderDelivery.class);
|
|
|
+ public void export(HttpServletResponse response, OrderDeliveryRequestDTO requestDTO) {
|
|
|
+ List<OrderDeliveryVO> list = orderDeliveryService.selectOrderDeliveryList(requestDTO);
|
|
|
+ ExcelUtil<OrderDeliveryVO> util = new ExcelUtil<OrderDeliveryVO>(OrderDeliveryVO.class);
|
|
|
util.exportExcel(response, list, "订单配送数据");
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 获取订单配送详细信息
|
|
|
*/
|
|
|
- @PreAuthorize("@ss.hasPermi('system:delivery:query')")
|
|
|
+ @PreAuthorize("@ss.hasPermi('order:delivery:query')")
|
|
|
@GetMapping(value = "/{id}")
|
|
|
@ApiOperation(value = "获取订单配送详细信息")
|
|
|
public AjaxResult getInfo(@PathVariable("id") Integer id) {
|
|
@@ -77,7 +79,7 @@ public class OrderDeliveryController extends BaseController {
|
|
|
/**
|
|
|
* 新增订单配送
|
|
|
*/
|
|
|
- @PreAuthorize("@ss.hasPermi('system:delivery:add')")
|
|
|
+ @PreAuthorize("@ss.hasPermi('order:delivery:add')")
|
|
|
@Log(title = "订单配送", businessType = BusinessType.INSERT)
|
|
|
@PostMapping
|
|
|
@ApiOperation(value = "新增订单配送")
|
|
@@ -90,7 +92,7 @@ public class OrderDeliveryController extends BaseController {
|
|
|
/**
|
|
|
* 修改订单配送
|
|
|
*/
|
|
|
- @PreAuthorize("@ss.hasPermi('system:delivery:edit')")
|
|
|
+ @PreAuthorize("@ss.hasPermi('order:delivery:edit')")
|
|
|
@Log(title = "订单配送", businessType = BusinessType.UPDATE)
|
|
|
@PutMapping
|
|
|
@ApiOperation(value = "修改订单配送")
|
|
@@ -103,7 +105,7 @@ public class OrderDeliveryController extends BaseController {
|
|
|
/**
|
|
|
* 删除订单配送
|
|
|
*/
|
|
|
- @PreAuthorize("@ss.hasPermi('system:delivery:remove')")
|
|
|
+ @PreAuthorize("@ss.hasPermi('order:delivery:remove')")
|
|
|
@Log(title = "订单配送", businessType = BusinessType.DELETE)
|
|
|
@DeleteMapping("/{ids}")
|
|
|
@ApiOperation(value = "删除订单配送")
|