1

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

@@ -373,7 +373,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
     public void pushOrderAddressToErp(FsStoreOrder partialOrder){
         if (partialOrder == null || partialOrder.getOrderId() == null) {
             log.info("传入订单为空或ID缺失，跳过ERP同步");
-            return;
+            throw new IllegalArgumentException("传入订单为空或ID缺失，跳过ERP同步");
         }
 
         // 1. 检查 ERP 是否开启
@@ -396,17 +396,17 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
         FsStoreOrder dbOrder = fsStoreOrderMapper.selectFsStoreOrderByOrderId(partialOrder.getOrderId());
         if (dbOrder == null) {
             log.error("数据库表fs_store_order中订单不存在，orderId: {}", partialOrder.getOrderId());
-            return;
+            throw new IllegalArgumentException("数据库表fs_store_order中订单不存在");
         }
         //判断当前是否满足推送条件(erp订单号不为空且订单状态为待发货时可推送)
-        if (StringUtils.isBlank(dbOrder.getExtendOrderId()) || dbOrder.getStatus() != 1) {
+        if (StringUtils.isBlank(dbOrder.getExtendOrderId()) || dbOrder.getStatus() != 2) {
             log.info("修改订单地址不满足推送到ERP条件: extendOrderId={}, status={}", dbOrder.getExtendOrderId(), dbOrder.getStatus());
-            return;
+            throw new RuntimeException("修改订单地址不满足推送到ERP条件");
         }
         // 3. 构造用于ERP推送的订单对象：订单地址用传入的新值
         if (StrUtil.isBlank(partialOrder.getUserAddress())){
             log.error("修改互联网医院订单地址为空，orderId: {}", partialOrder.getOrderId());
-            return;
+            throw new IllegalArgumentException(String.format("修改互联网医院订单地址为空，orderId: %d", partialOrder.getOrderId()));
         }
         dbOrder.setUserAddress(partialOrder.getUserAddress());
         // 4. 构建 ERP 订单对象
@@ -422,6 +422,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
                     dbOrder.getOrderCode(), erpType, response.getSuccess(), response.getCode());
         } catch (Exception e) {
             log.error("推送修改互联网医院订单地址到ERP失败，orderId: {}", partialOrder.getOrderId(), e);
+            throw e;
         }
     }