diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java index b8cc5ad33..2b32fab28 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java @@ -33,6 +33,8 @@ import com.mhd.common.core.domain.entity.R; import com.mhd.common.core.domain.entity.TmsOrder; import com.mhd.common.core.domain.po.UserPo; import com.mhd.common.core.domain.po.UserShipperPo; +import com.mhd.common.core.domain.po.thirdparty.SysDepartInterfaceInfoPo; +import com.mhd.common.core.domain.thirdparty.SysDepartInterfaceInfoDTO; import com.mhd.common.core.domain.thirdparty.dingtalk.DetailsDTO; import com.mhd.common.core.domain.thirdparty.dingtalk.FormComponentValuesDTO; import com.mhd.common.core.domain.thirdparty.dingtalk.WorkflowProcessInstancesDTO; @@ -61,6 +63,7 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; +import javax.annotation.Resource; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.Marshaller; @@ -109,10 +112,10 @@ public class ReconciliationImpl extends ServiceImpl urlList = thirdPartyServiceFeign.querylist(query); + if (urlList != null && urlList.size() > 0) { + url = urlList.get(0).getInterfaceType(); + } else { + throw new ServiceException("未找到该组织的推送地址!"); + } String invoiceNumber=""; R ajaxResult2=wlhyServiceFeign.selectInvoiceListById(reconciliation.getInvoiceId()); if(ajaxResult2.getCode()==200){ @@ -564,7 +578,7 @@ public class ReconciliationImpl extends ServiceImpl urlList = thirdPartyServiceFeign.querylist(query); + if (urlList != null && urlList.size() > 0) { + url = urlList.get(0).getInterfaceType(); + } else { + throw new ServiceException("未找到该组织的推送地址!"); + } List list=result.getData(); if(ObjectUtil.isNotNull(list)){ makerCodeNc=list.get(0).getMakerCodeNc(); @@ -872,6 +897,17 @@ public class ReconciliationImpl extends ServiceImpl> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO); + String url = ""; + SysDepartInterfaceInfoDTO query= new SysDepartInterfaceInfoDTO(); + query.setOrganizationId(reconciliation.getOrganizationId()); + query.setOrganizationName(reconciliation.getOrganizationName()); + query.setInterfaceType("nc"); + List urlList = thirdPartyServiceFeign.querylist(query); + if (urlList != null && urlList.size() > 0) { + url = urlList.get(0).getInterfaceType(); + } else { + throw new ServiceException("未找到该组织的推送地址!"); + } if(result.getCode()==200){ List list=result.getData(); if(ObjectUtil.isNotNull(list)){ @@ -971,7 +1007,7 @@ public class ReconciliationImpl extends ServiceImpl> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO); + String url = ""; + SysDepartInterfaceInfoDTO query= new SysDepartInterfaceInfoDTO(); + query.setOrganizationId(reconciliation.getOrganizationId()); + query.setOrganizationName(reconciliation.getOrganizationName()); + query.setInterfaceType("nc"); + List urlList = thirdPartyServiceFeign.querylist(query); + if (urlList != null && urlList.size() > 0) { + url = urlList.get(0).getInterfaceType(); + } else { + throw new ServiceException("未找到该组织的推送地址!"); + } if(result.getCode()==200){ List list=result.getData(); if(ObjectUtil.isNotNull(list)){ @@ -1208,4 +1255,4 @@ public class ReconciliationImpl extends ServiceImpl