feat(order): 订单新增接口返回订单数据
- 修改 CrmOrderController 的 add 方法返回 CrmOrderVo 类型数据 - 修改 CrmOrderItemController 的 add 方法返回 CrmOrderItemVo 类型数据 - 更新 CrmOrderServiceImpl 的 insertByBo 方法返回订单查询结果 - 更新 CrmOrderItemServiceImpl 的 insertByBo 方法返回订单明细查询结果 - 调整服务层接口返回类型从 Boolean 改为对应的 Vo 类型 - 新增订单成功后返回完整的订单或订单明细信息
This commit is contained in:
@@ -71,8 +71,8 @@ public class CrmOrderController extends BaseController {
|
|||||||
@Log(title = "正式订单主", businessType = BusinessType.INSERT)
|
@Log(title = "正式订单主", businessType = BusinessType.INSERT)
|
||||||
@RepeatSubmit()
|
@RepeatSubmit()
|
||||||
@PostMapping()
|
@PostMapping()
|
||||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody CrmOrderBo bo) {
|
public R<CrmOrderVo> add(@Validated(AddGroup.class) @RequestBody CrmOrderBo bo) {
|
||||||
return toAjax(iCrmOrderService.insertByBo(bo));
|
return R.ok(iCrmOrderService.insertByBo(bo));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -71,8 +71,8 @@ public class CrmOrderItemController extends BaseController {
|
|||||||
@Log(title = "正式订单明细", businessType = BusinessType.INSERT)
|
@Log(title = "正式订单明细", businessType = BusinessType.INSERT)
|
||||||
@RepeatSubmit()
|
@RepeatSubmit()
|
||||||
@PostMapping()
|
@PostMapping()
|
||||||
public R<Void> add(@Validated(AddGroup.class) @RequestBody CrmOrderItemBo bo) {
|
public R<CrmOrderItemVo> add(@Validated(AddGroup.class) @RequestBody CrmOrderItemBo bo) {
|
||||||
return toAjax(iCrmOrderItemService.insertByBo(bo));
|
return R.ok(iCrmOrderItemService.insertByBo(bo));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ public interface ICrmOrderItemService {
|
|||||||
/**
|
/**
|
||||||
* 新增正式订单明细
|
* 新增正式订单明细
|
||||||
*/
|
*/
|
||||||
Boolean insertByBo(CrmOrderItemBo bo);
|
CrmOrderItemVo insertByBo(CrmOrderItemBo bo);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改正式订单明细
|
* 修改正式订单明细
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ public interface ICrmOrderService {
|
|||||||
/**
|
/**
|
||||||
* 新增正式订单主
|
* 新增正式订单主
|
||||||
*/
|
*/
|
||||||
Boolean insertByBo(CrmOrderBo bo);
|
CrmOrderVo insertByBo(CrmOrderBo bo);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 修改正式订单主
|
* 修改正式订单主
|
||||||
|
|||||||
@@ -74,14 +74,15 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService {
|
|||||||
* 新增正式订单明细
|
* 新增正式订单明细
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Boolean insertByBo(CrmOrderItemBo bo) {
|
public CrmOrderItemVo insertByBo(CrmOrderItemBo bo) {
|
||||||
CrmOrderItem add = BeanUtil.toBean(bo, CrmOrderItem.class);
|
CrmOrderItem add = BeanUtil.toBean(bo, CrmOrderItem.class);
|
||||||
validEntityBeforeSave(add);
|
validEntityBeforeSave(add);
|
||||||
boolean flag = baseMapper.insert(add) > 0;
|
boolean flag = baseMapper.insert(add) > 0;
|
||||||
if (flag) {
|
if (flag) {
|
||||||
bo.setItemId(add.getItemId());
|
bo.setItemId(add.getItemId());
|
||||||
|
return baseMapper.selectVoById(add.getItemId());
|
||||||
}
|
}
|
||||||
return flag;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -102,14 +102,15 @@ public class CrmOrderServiceImpl implements ICrmOrderService {
|
|||||||
* 新增正式订单主
|
* 新增正式订单主
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public Boolean insertByBo(CrmOrderBo bo) {
|
public CrmOrderVo insertByBo(CrmOrderBo bo) {
|
||||||
CrmOrder add = BeanUtil.toBean(bo, CrmOrder.class);
|
CrmOrder add = BeanUtil.toBean(bo, CrmOrder.class);
|
||||||
validEntityBeforeSave(add);
|
validEntityBeforeSave(add);
|
||||||
boolean flag = baseMapper.insert(add) > 0;
|
boolean flag = baseMapper.insert(add) > 0;
|
||||||
if (flag) {
|
if (flag) {
|
||||||
bo.setOrderId(add.getOrderId());
|
bo.setOrderId(add.getOrderId());
|
||||||
|
return baseMapper.selectVoById(add.getOrderId());
|
||||||
}
|
}
|
||||||
return flag;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user