From a5465751451f674a80ca82e01e95f57613fb37a7 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 26 Dec 2025 13:10:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E8=AE=A2=E5=8D=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改 CrmOrderController 的 add 方法返回 CrmOrderVo 类型数据 - 修改 CrmOrderItemController 的 add 方法返回 CrmOrderItemVo 类型数据 - 更新 CrmOrderServiceImpl 的 insertByBo 方法返回订单查询结果 - 更新 CrmOrderItemServiceImpl 的 insertByBo 方法返回订单明细查询结果 - 调整服务层接口返回类型从 Boolean 改为对应的 Vo 类型 - 新增订单成功后返回完整的订单或订单明细信息 --- .../main/java/com/klp/crm/controller/CrmOrderController.java | 4 ++-- .../java/com/klp/crm/controller/CrmOrderItemController.java | 4 ++-- .../main/java/com/klp/crm/service/ICrmOrderItemService.java | 2 +- .../src/main/java/com/klp/crm/service/ICrmOrderService.java | 2 +- .../com/klp/crm/service/impl/CrmOrderItemServiceImpl.java | 5 +++-- .../java/com/klp/crm/service/impl/CrmOrderServiceImpl.java | 5 +++-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/klp-crm/src/main/java/com/klp/crm/controller/CrmOrderController.java b/klp-crm/src/main/java/com/klp/crm/controller/CrmOrderController.java index bdc2d625..7c799c5f 100644 --- a/klp-crm/src/main/java/com/klp/crm/controller/CrmOrderController.java +++ b/klp-crm/src/main/java/com/klp/crm/controller/CrmOrderController.java @@ -71,8 +71,8 @@ public class CrmOrderController extends BaseController { @Log(title = "正式订单主", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CrmOrderBo bo) { - return toAjax(iCrmOrderService.insertByBo(bo)); + public R add(@Validated(AddGroup.class) @RequestBody CrmOrderBo bo) { + return R.ok(iCrmOrderService.insertByBo(bo)); } /** diff --git a/klp-crm/src/main/java/com/klp/crm/controller/CrmOrderItemController.java b/klp-crm/src/main/java/com/klp/crm/controller/CrmOrderItemController.java index b8ae9206..10d98bf0 100644 --- a/klp-crm/src/main/java/com/klp/crm/controller/CrmOrderItemController.java +++ b/klp-crm/src/main/java/com/klp/crm/controller/CrmOrderItemController.java @@ -71,8 +71,8 @@ public class CrmOrderItemController extends BaseController { @Log(title = "正式订单明细", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() - public R add(@Validated(AddGroup.class) @RequestBody CrmOrderItemBo bo) { - return toAjax(iCrmOrderItemService.insertByBo(bo)); + public R add(@Validated(AddGroup.class) @RequestBody CrmOrderItemBo bo) { + return R.ok(iCrmOrderItemService.insertByBo(bo)); } /** diff --git a/klp-crm/src/main/java/com/klp/crm/service/ICrmOrderItemService.java b/klp-crm/src/main/java/com/klp/crm/service/ICrmOrderItemService.java index c55da3c3..2111a1f4 100644 --- a/klp-crm/src/main/java/com/klp/crm/service/ICrmOrderItemService.java +++ b/klp-crm/src/main/java/com/klp/crm/service/ICrmOrderItemService.java @@ -35,7 +35,7 @@ public interface ICrmOrderItemService { /** * 新增正式订单明细 */ - Boolean insertByBo(CrmOrderItemBo bo); + CrmOrderItemVo insertByBo(CrmOrderItemBo bo); /** * 修改正式订单明细 diff --git a/klp-crm/src/main/java/com/klp/crm/service/ICrmOrderService.java b/klp-crm/src/main/java/com/klp/crm/service/ICrmOrderService.java index 6c7d2236..da7f397e 100644 --- a/klp-crm/src/main/java/com/klp/crm/service/ICrmOrderService.java +++ b/klp-crm/src/main/java/com/klp/crm/service/ICrmOrderService.java @@ -35,7 +35,7 @@ public interface ICrmOrderService { /** * 新增正式订单主 */ - Boolean insertByBo(CrmOrderBo bo); + CrmOrderVo insertByBo(CrmOrderBo bo); /** * 修改正式订单主 diff --git a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java index 9ee3aa50..3705995b 100644 --- a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java +++ b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java @@ -74,14 +74,15 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService { * 新增正式订单明细 */ @Override - public Boolean insertByBo(CrmOrderItemBo bo) { + public CrmOrderItemVo insertByBo(CrmOrderItemBo bo) { CrmOrderItem add = BeanUtil.toBean(bo, CrmOrderItem.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setItemId(add.getItemId()); + return baseMapper.selectVoById(add.getItemId()); } - return flag; + return null; } /** diff --git a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java index 4964b61e..4c2c09ca 100644 --- a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java +++ b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderServiceImpl.java @@ -102,14 +102,15 @@ public class CrmOrderServiceImpl implements ICrmOrderService { * 新增正式订单主 */ @Override - public Boolean insertByBo(CrmOrderBo bo) { + public CrmOrderVo insertByBo(CrmOrderBo bo) { CrmOrder add = BeanUtil.toBean(bo, CrmOrder.class); validEntityBeforeSave(add); boolean flag = baseMapper.insert(add) > 0; if (flag) { bo.setOrderId(add.getOrderId()); + return baseMapper.selectVoById(add.getOrderId()); } - return flag; + return null; } /**