1

fs-service/src/main/java/com/fs/his/service/impl/FsStoreOrderServiceImpl.java

@@ -2,6 +2,7 @@ package com.fs.his.service.impl;
 
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.net.URLDecoder;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
@@ -399,7 +400,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
             throw new IllegalArgumentException("数据库表fs_store_order中订单不存在");
         }
         //判断当前是否满足推送条件(erp订单号不为空且订单状态为待发货时可推送)
-        if (StringUtils.isBlank(dbOrder.getExtendOrderId()) || dbOrder.getStatus() != 2) {
+        if (!(StringUtils.isNotBlank(dbOrder.getExtendOrderId()) && ObjectUtil.equal(dbOrder.getStatus(),2))) {
             log.info("修改订单地址不满足推送到ERP条件: extendOrderId={}, status={}", dbOrder.getExtendOrderId(), dbOrder.getStatus());
             throw new RuntimeException("修改订单地址不满足推送到ERP条件");
         }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -441,7 +441,7 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             return;
         }
         //判断当前是否满足推送条件(erp订单号不为空且订单状态为待发货时可推送)
-        if (StringUtils.isBlank(dbOrder.getExtendOrderId()) || dbOrder.getStatus() != 1) {
+        if (!(StringUtils.isNotBlank(dbOrder.getExtendOrderId()) && ObjectUtil.equal(dbOrder.getStatus(),2))) {
             log.info("不满足修改订单地址推送到ERP条件: extendOrderId={}, status={}", dbOrder.getExtendOrderId(), dbOrder.getStatus());
             throw new RuntimeException("只支持待发货修改地址！");
         }