diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java index d34ceaa..550a9eb 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysOrderNoRuleController.java @@ -378,7 +378,16 @@ public class SysOrderNoRuleController extends CoreBaseController { @GetMapping(value = "/get-order-no/{code}") @ApiOperation(value = "根据单号规则代码,生成单号") public synchronized ResultBean getOrderNo(@PathVariable("code") String code) { - return getOrderNo(code,1); + try { + ValidatorBean.checkNotNull(code, "code不能为空"); + + SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleCode(code); + return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + } catch (ImppBusiException busExcep) { + return ResultBean.fail(busExcep); + } catch (Exception e) { + return ImppExceptionBuilder.newInstance().buildExceptionResult(e); + } } /** @@ -389,16 +398,16 @@ public class SysOrderNoRuleController extends CoreBaseController { */ @GetMapping(value = "/get-order-no/{code}/{num}") @ApiOperation(value = "根据单号规则代码,生成单号") - public synchronized ResultBean getOrderNo(@PathVariable("code") String code,@PathVariable("num") Integer num) { + public synchronized ResultBean getOrderNo(@PathVariable("code") String code,@PathVariable("num") Integer num) { try { ValidatorBean.checkNotNull(code, "code不能为空"); ValidatorBean.checkNotZero(num,"次数不能为零"); - List sysOrderNoRuleList = new ArrayList<>(); + List orderNoList = new ArrayList<>(); for (int i = 0; i < num; i++) { - sysOrderNoRuleList.add(sysOrderNoRuleService.getSysOrderNoRuleCode(code)); + orderNoList.add(sysOrderNoRuleService.getSysOrderNoRuleCode(code).getOrderNo()); } - return ResultBean.success("操作成功").setResultList(sysOrderNoRuleList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + return ResultBean.success("操作成功").setResultList(orderNoList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) {