From 9868b8b647af30b54e5a9d5b00c74e819a4ba500 Mon Sep 17 00:00:00 2001 From: "wei.peng" Date: Fri, 21 Dec 2018 14:55:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95Bug=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=EF=BC=8C=20Cloud=20=E8=BF=9E=E6=8E=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/busi/SysOrderNoRuleController.java | 31 +++++++++++----------- 1 file changed, 16 insertions(+), 15 deletions(-) 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 ef267e4..9c39549 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 @@ -141,21 +141,6 @@ public class SysOrderNoRuleController extends CoreBaseController { } } - @GetMapping(value = "/get-order-no/{code}") - @ApiOperation(value = "根据单号规则代码，获取单号") - public ResultBean getOrderNo(@PathVariable("code") String code){ - 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); - } - } - @GetMapping(value = "/query") @ApiOperation(value = "单号规则复杂查询，分页，排序") public ResultBean querySysOrderNoRuleByPager(SysOrderNoRule sysOrderNoRule, Pager pager){ @@ -356,4 +341,20 @@ public class SysOrderNoRuleController extends CoreBaseController { .checkNotZero("serialNoLength",sysOrderNoRule.getSerialNoLength()) .checkNotZero("isCycle",sysOrderNoRule.getIsCycle()); } + + + @GetMapping(value = "/get-order-no/{code}") + @ApiOperation(value = "根据单号规则代码，生成单号") + public ResultBean getOrderNo(@PathVariable("code") String code){ + 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); + } + } }