diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java index c683a5f08..4895da857 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/controller/YieldOrderController.java @@ -381,4 +381,14 @@ public class YieldOrderController extends BladeController { public R subItemAssignment(@Parameter(description = "主键", required = true) @RequestParam String id) { return R.data(yieldOrderService.subItemAssignment(id)); } + + /** + * 新增订单 + */ + @PostMapping("/saveYieldOrder") + @Operation(summary = "新增", description = "") + public R saveYieldOrder(@Valid @RequestBody YieldOrder entity) { + Boolean result = yieldOrderService.saveYieldOrder(entity); + return R.status(result); + } } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java index df8688d77..bd0ef73c6 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/IYieldOrderService.java @@ -316,4 +316,11 @@ public interface IYieldOrderService extends BaseService { * @return */ boolean subItemAssignment(String id); + + /** + * 新增订单 + * @param entity + * @return + */ + Boolean saveYieldOrder(YieldOrder entity); } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java index b3a6b4f74..f8839e31f 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/order/service/impl/YieldOrderServiceImpl.java @@ -2007,6 +2007,22 @@ public class YieldOrderServiceImpl extends BaseServiceImpl queryWrapper = Wrappers.lambdaQuery(YieldOrder.class).eq(YieldOrder::getCardNo, entity.getCardNo()); + List yieldOrders = baseMapper.selectList(queryWrapper); + if(CollectionUtils.isNotEmpty(yieldOrders)){ + throw new ServiceException("订单已存在:{}" +entity.getCardNo()); + } + + entity.setCardNo(nextCardNo()); + entity.setStatus(YieldOrderEnum.STATUS_NORMAL.getCode()); + entity.setSiteWork(Boolean.TRUE); + entity.setValidationResult(YieldOrderEnum.VALIDATION_NO.getCode()); + return this.save(entity); + } + /** * @param codeType 0:订单号、1:流程卡号;2、批次号 * @return String