feat: 推送ERP

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

@@ -362,8 +362,12 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public int updateAddressErpFsStoreOrder(FsStoreOrder fsStoreOrder) {
         fsStoreOrder.setUpdateTime(DateUtils.getNowDate());
+        int i = fsStoreOrderMapper.updateFsStoreOrder(fsStoreOrder);
+
+        fsStoreOrder = fsStoreOrderMapper.selectFsStoreOrderByOrderId(fsStoreOrder.getOrderId());
         //推送修改的互联网医院订单地址到聚水潭ERP
         try {
             pushOrderAddressToErp(fsStoreOrder);
@@ -371,7 +375,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService {
             log.error("修改互联网医院订单地址推送到聚水潭ERP失败，orderId: {}", fsStoreOrder.getOrderId(), e);
             throw new RuntimeException(String.format("修改互联网医院订单地址推送到聚水潭ERP失败,orderId: %d",fsStoreOrder.getOrderId()), e);
         }
-        return fsStoreOrderMapper.updateFsStoreOrder(fsStoreOrder);
+        return i;
     }
 
     /**

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

@@ -399,19 +399,21 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class,propagation = Propagation.REQUIRED)
     public int updateAddressErpFsStoreOrder(FsStoreOrderScrm fsStoreOrder) {
         fsStoreOrder.setUpdateTime(DateUtils.getNowDate());
+        int i = fsStoreOrderMapper.updateFsStoreOrder(fsStoreOrder);
 
         FsStoreOrderScrm order = fsStoreOrderMapper.selectFsStoreOrderById(fsStoreOrder.getId());
         if(ObjectUtil.isNull(order)) {
             throw new IllegalArgumentException("ERP单号不存在！");
         }
         //推送修改的商城订单地址到聚水潭ERP 如果地址变化
-        if(!StringUtil.equals(fsStoreOrder.getUserAddress(),order.getUserAddress())){
-            pushOrderAddressToErp(fsStoreOrder);
+        if(!StringUtil.equals(order.getUserAddress(),order.getUserAddress())){
+            pushOrderAddressToErp(order);
         }
+        return i;
 
-        return fsStoreOrderMapper.updateFsStoreOrder(fsStoreOrder);
     }
 
     /**