From ede2f2e8fba53ab7b60b43723de81d32bf7ebfe2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=81=E9=BD=90?= <280645618@qq.com> Date: Mon, 17 Jun 2024 18:13:38 +0800 Subject: [PATCH] up --- .../pdd/controller/EwaybillController.java | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/open-api/pdd-api/src/main/java/com/qihang/pdd/controller/EwaybillController.java b/open-api/pdd-api/src/main/java/com/qihang/pdd/controller/EwaybillController.java index 7b2a8622..fb207720 100644 --- a/open-api/pdd-api/src/main/java/com/qihang/pdd/controller/EwaybillController.java +++ b/open-api/pdd-api/src/main/java/com/qihang/pdd/controller/EwaybillController.java @@ -214,29 +214,29 @@ public class EwaybillController extends BaseController { return success(); } -// @PostMapping("/get_print_data") -// @ResponseBody -// public AjaxResult getPrintData(@RequestBody TaoWaybillGetBo req) { -// if (req.getShopId() == null || req.getShopId() <= 0) { -// return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误，没有店铺Id"); -// } -// if (req.getIds() == null || req.getIds().length <= 0) { -// return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误，没有选择订单"); -// } -// List listByOrderIds = erpShipWaybillService.getListByOrderIds(req.getShopId(), req.getIds()); -// return AjaxResult.success(listByOrderIds); -// } -// -// @PostMapping("/push_print_success") -// @ResponseBody -// public AjaxResult pushPrintSuccess(@RequestBody TaoWaybillGetBo req) { -// if (req.getShopId() == null || req.getShopId() <= 0) { -// return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误，没有店铺Id"); -// } -// if (req.getIds() == null || req.getIds().length <= 0) { -// return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误，没有选择订单"); -// } -// erpShipWaybillService.printSuccess(req.getShopId(), req.getIds()); -// return AjaxResult.success(); -// } + @PostMapping("/get_print_data") + @ResponseBody + public AjaxResult getPrintData(@RequestBody PddWaybillGetBo req) { + if (req.getShopId() == null || req.getShopId() <= 0) { + return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误，没有店铺Id"); + } + if (req.getIds() == null || req.getIds().length <= 0) { + return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误，没有选择订单"); + } + List listByOrderIds = erpShipWaybillService.getListByOrderIds(req.getShopId(), req.getIds()); + return AjaxResult.success(listByOrderIds); + } + + @PostMapping("/push_print_success") + @ResponseBody + public AjaxResult pushPrintSuccess(@RequestBody PddWaybillGetBo req) { + if (req.getShopId() == null || req.getShopId() <= 0) { + return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误，没有店铺Id"); + } + if (req.getIds() == null || req.getIds().length <= 0) { + return AjaxResult.error(HttpStatus.PARAMS_ERROR, "参数错误，没有选择订单"); + } + erpShipWaybillService.printSuccess(req.getShopId(), req.getIds()); + return AjaxResult.success(); + } }