xdd 2 днів тому
батько
коміт
726813044b

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

@@ -412,7 +412,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
             throw new IllegalArgumentException("数据库表fs_store_order中订单不存在");
         }
         //判断当前是否满足推送条件(erp订单号不为空且订单状态为待发货时可推送)
-        if (!(StringUtils.isNotBlank(dbOrder.getExtendOrderId()) && ObjectUtil.equal(dbOrder.getStatus(),1))) {
+        if (StringUtils.isBlank(dbOrder.getExtendOrderId())) {
             log.info("修改订单地址不满足推送到ERP条件: extendOrderId={}, status={}", dbOrder.getExtendOrderId(), dbOrder.getStatus());
             throw new RuntimeException("修改订单地址不满足推送到ERP条件");
         }

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

@@ -448,9 +448,9 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
             return;
         }
         //判断当前是否满足推送条件(erp订单号不为空且订单状态为待发货时可推送)
-        if (!(StringUtils.isNotBlank(dbOrder.getExtendOrderId()) && ObjectUtil.equal(dbOrder.getStatus(),1))) {
+        if (StringUtils.isBlank(dbOrder.getExtendOrderId())) {
             log.info("不满足修改订单地址推送到ERP条件: extendOrderId={}, status={}", dbOrder.getExtendOrderId(), dbOrder.getStatus());
-            throw new RuntimeException("只支持待发货修改地址!");
+            throw new RuntimeException("不满足修改订单地址推送到ERP条件!");
         }
         // 3. 构造用于ERP推送的订单对象:订单地址用传入的新值
         if (StrUtil.isBlank(partialOrder.getUserAddress())){