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 2748e78..d34ceaa 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 @@ -64,9 +64,9 @@ public class SysOrderNoRuleController extends CoreBaseController { private FastDFSClient dfsClient; /** - * - * @param sysOrderNoRule - * @return + * 新增单号规则 + * @param sysOrderNoRule 单号规则 + * @return 处理结果 */ @PostMapping(value = "/insert") @ApiOperation(value = "新增单号规则") @@ -87,6 +87,11 @@ public class SysOrderNoRuleController extends CoreBaseController { } } + /** + * 修改单号规则 + * @param sysOrderNoRule 单号规则 + * @return + */ @PutMapping(value = "/update") @ApiOperation(value = "修改单号规则") public ResultBean updateSysOrderNoRule(SysOrderNoRule sysOrderNoRule) { @@ -365,14 +370,35 @@ public class SysOrderNoRuleController extends CoreBaseController { .checkNotZero("isCycle", sysOrderNoRule.getIsCycle()); } + /** + * 生成单号 + * @param code 单号规则代码 + * @return 处理结果 + */ @GetMapping(value = "/get-order-no/{code}") @ApiOperation(value = "根据单号规则代码,生成单号") - public synchronized ResultBean getOrderNo(@PathVariable("code") String code) { + public synchronized ResultBean getOrderNo(@PathVariable("code") String code) { + return getOrderNo(code,1); + } + + /** + * 根据单号规则代码,生成单号 + * @param code 单号规则代码 + * @param num 生成数量 + * @return 处理结果 + */ + @GetMapping(value = "/get-order-no/{code}/{num}") + @ApiOperation(value = "根据单号规则代码,生成单号") + public synchronized ResultBean getOrderNo(@PathVariable("code") String code,@PathVariable("num") Integer num) { try { ValidatorBean.checkNotNull(code, "code不能为空"); + ValidatorBean.checkNotZero(num,"次数不能为零"); - SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleCode(code); - return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); + List sysOrderNoRuleList = new ArrayList<>(); + for (int i = 0; i < num; i++) { + sysOrderNoRuleList.add(sysOrderNoRuleService.getSysOrderNoRuleCode(code)); + } + return ResultBean.success("操作成功").setResultList(sysOrderNoRuleList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); } catch (ImppBusiException busExcep) { return ResultBean.fail(busExcep); } catch (Exception e) {