Accept Merge Request #100: (dev-xwt -> dev-test)

Merge Request: 判断条件

Created By: @夏文涛
Accepted By: @夏文涛
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/100?initial=true

src/main/java/com/sqx/modules/errand/controller/app/AppTbIndentController.java

@@ -392,7 +392,7 @@ public class AppTbIndentController {
                 throw new SqxException("不能操作非自己的订单");
             }
 
-            if (!"3".equals(data.getIndentState())) {
+            if (!"3".equals(data.getIndentState()) && !"4".equals(data.getIndentState())) {
                 throw new SqxException("订单状态发生变更，请刷新后重试！");
             }
 

src/main/java/com/sqx/modules/errand/service/impl/TbIndentServiceImpl.java

@@ -1070,7 +1070,7 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
             throw new SqxException("不能操作非自己的订单");
         }
 
-        if (!"3".equals(indent.getIndentState())) {
+        if (!"3".equals(indent.getIndentState()) && !"4".equals(indent.getIndentState())) {
             throw new SqxException("订单状态发生变更，请刷新后重试！");
         }
 
@@ -1873,7 +1873,7 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
             throw new SqxException("不能操作非自己的订单");
         }
 
-        if (!"3".equals(indent.getIndentState())) {
+        if (!"3".equals(indent.getIndentState()) && !"4".equals(indent.getIndentState())) {
             throw new SqxException("订单状态发生变更，请刷新后重试！");
         }