From 18e0d0d60a29cdf0a47ce63c44bdce83548e1b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= <yunhao.wang@estsh.com>
Date: Tue, 21 May 2019 09:22:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BB=E5=86=99=E5=88=86=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/core/api/iservice/busi/ISysOrderNoRuleService.java   | 2 +-
 .../estsh/i3plus/core/apiservice/controller/base/WhiteController.java | 2 +-
 .../core/apiservice/controller/busi/SysOrderNoRuleController.java     | 4 ++--
 .../core/apiservice/serviceimpl/busi/SysOrderNoRuleService.java       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrderNoRuleService.java b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrderNoRuleService.java
index 4f651c2..a177138 100644
--- a/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrderNoRuleService.java
+++ b/modules/i3plus-core-api/src/main/java/cn/estsh/i3plus/core/api/iservice/busi/ISysOrderNoRuleService.java
@@ -61,7 +61,7 @@ public interface ISysOrderNoRuleService {
      * @return 单号信息
      */
     @ApiOperation(value = "根据code查询最新单号规则")
-    SysOrderNoRule getSysOrderNoRuleCode(String code);
+    SysOrderNoRule doGetSysOrderNoRuleCode(String code);
 
     /**
      * 根据id修改单号规则状态
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
index c0f7633..3fd60fb 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/WhiteController.java
@@ -303,7 +303,7 @@ public class WhiteController extends CoreBaseController {
         try {
             ValidatorBean.checkNotNull(code, "code不能为空");
 
-            SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleCode(code);
+            SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.doGetSysOrderNoRuleCode(code);
             return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep);
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 90df351..b9a4709 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
@@ -383,7 +383,7 @@ public class SysOrderNoRuleController extends CoreBaseController {
         try {
             ValidatorBean.checkNotNull(code, "code不能为空");
 
-            SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.getSysOrderNoRuleCode(code);
+            SysOrderNoRule sysOrderNoRule = sysOrderNoRuleService.doGetSysOrderNoRuleCode(code);
             return ResultBean.success("操作成功").setResultObject(sysOrderNoRule).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
             return ResultBean.fail(busExcep);
@@ -407,7 +407,7 @@ public class SysOrderNoRuleController extends CoreBaseController {
 
             List<String> orderNoList = new ArrayList<>();
             for (int i = 0; i < num; i++) {
-                orderNoList.add(sysOrderNoRuleService.getSysOrderNoRuleCode(code).getOrderNo());
+                orderNoList.add(sysOrderNoRuleService.doGetSysOrderNoRuleCode(code).getOrderNo());
             }
             return ResultBean.success("操作成功").setResultList(orderNoList).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
         } catch (ImppBusiException busExcep) {
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrderNoRuleService.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrderNoRuleService.java
index ffc051a..274cd74 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrderNoRuleService.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/SysOrderNoRuleService.java
@@ -89,7 +89,7 @@ public class SysOrderNoRuleService implements ISysOrderNoRuleService {
 
     @Override
     @ApiOperation(value = "根据code查询最新单号规则")
-    public synchronized SysOrderNoRule getSysOrderNoRuleCode(String code) {
+    public synchronized SysOrderNoRule doGetSysOrderNoRuleCode(String code) {
         SysOrderNoRule sysOrderNoRule = sysOrderNoRuleRDao.getByProperty("orderNoRuleCode", code);
 
         if (sysOrderNoRule == null) {