Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/dubbo/TransportDubboServiceImpl.java

@@ -353,13 +353,13 @@ public class TransportDubboServiceImpl implements TransportDubboService {
         }
 
         if (LogisticsOrderEnum.HAVE_RECONCILED.getStatus().equals(status)) {
-            if (!LogisticsOrderEnum.HAVE_FINISHED.getStatus().equals(status)) {
+            if (!LogisticsOrderEnum.HAVE_FINISHED.getStatus().equals(String.valueOf(kwtLogisticsOrder.getStatus()))) {
                 httpResult.setMsg("物流单据状态有误,不能修改");
                 httpResult.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
                 return httpResult;
             }
         } else if (LogisticsOrderEnum.HAVE_ALREADY_SETTLED.getStatus().equals(status)) {
-            if (!LogisticsOrderEnum.HAVE_RECONCILED.getStatus().equals(status)) {
+            if (!LogisticsOrderEnum.HAVE_RECONCILED.getStatus().equals(String.valueOf(kwtLogisticsOrder.getStatus()))) {
                 httpResult.setMsg("物流单据状态有误,不能修改");
                 httpResult.setCode(HttpStatus.GLOBAL_EXCEPTION_CODE);
                 return httpResult;