From 8baaab8f4402aeabb734d0f66befe54489ec4156 Mon Sep 17 00:00:00 2001
From: "yunhao.wang" <yunhao.wang@estsh.com>
Date: Thu, 9 May 2019 18:26:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=89=B9=E9=87=8F=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=8D=95=E5=8F=B7=E6=8E=A5=E5=8F=A3=E5=8F=8A=E5=BE=AE?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=B0=83=E7=94=A8=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/busi/SysOrderNoRuleController.java  | 38 ++++++++++++++++++----
 1 file changed, 32 insertions(+), 6 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 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<SysOrderNoRule> 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<SysOrderNoRule> 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<SysOrderNoRule> 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) {