nc推送地址动态从三方接口获取;
This commit is contained in:
+51
-4
@@ -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.entity.TmsOrder;
|
||||||
import com.mhd.common.core.domain.po.UserPo;
|
import com.mhd.common.core.domain.po.UserPo;
|
||||||
import com.mhd.common.core.domain.po.UserShipperPo;
|
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.DetailsDTO;
|
||||||
import com.mhd.common.core.domain.thirdparty.dingtalk.FormComponentValuesDTO;
|
import com.mhd.common.core.domain.thirdparty.dingtalk.FormComponentValuesDTO;
|
||||||
import com.mhd.common.core.domain.thirdparty.dingtalk.WorkflowProcessInstancesDTO;
|
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.w3c.dom.NodeList;
|
||||||
import org.xml.sax.InputSource;
|
import org.xml.sax.InputSource;
|
||||||
|
|
||||||
|
import javax.annotation.Resource;
|
||||||
import javax.xml.bind.JAXBContext;
|
import javax.xml.bind.JAXBContext;
|
||||||
import javax.xml.bind.JAXBException;
|
import javax.xml.bind.JAXBException;
|
||||||
import javax.xml.bind.Marshaller;
|
import javax.xml.bind.Marshaller;
|
||||||
@@ -109,10 +112,10 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
|||||||
@Autowired
|
@Autowired
|
||||||
private TmsReceiptMapper tmsReceiptMapper;
|
private TmsReceiptMapper tmsReceiptMapper;
|
||||||
//nc测试环境地址
|
//nc测试环境地址
|
||||||
private String url="http://10.0.0.212/service/XChangeServlet?account=NKNC&groupcode=CNK";
|
//private String url="http://10.0.0.212/service/XChangeServlet?account=NKNC&groupcode=CNK";
|
||||||
|
|
||||||
//nc正式环境地址
|
//nc正式环境地址
|
||||||
private String zsurl="http://10.0.0.202/service/XChangeServlet?account=NKNC&groupcode=CNK";
|
//private String zsurl="http://10.0.0.202/service/XChangeServlet?account=NKNC&groupcode=CNK";
|
||||||
/**
|
/**
|
||||||
* 查询对账单列表
|
* 查询对账单列表
|
||||||
*/
|
*/
|
||||||
@@ -433,6 +436,17 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
|||||||
String makerCodeNc="";
|
String makerCodeNc="";
|
||||||
if(reconciliation.getOrganizationName().contains("南岐")){
|
if(reconciliation.getOrganizationName().contains("南岐")){
|
||||||
if(result.getCode()==200){
|
if(result.getCode()==200){
|
||||||
|
String url = "";
|
||||||
|
SysDepartInterfaceInfoDTO query= new SysDepartInterfaceInfoDTO();
|
||||||
|
query.setOrganizationId(reconciliation.getOrganizationId());
|
||||||
|
query.setOrganizationName(reconciliation.getOrganizationName());
|
||||||
|
query.setInterfaceType("nc");
|
||||||
|
List<SysDepartInterfaceInfoPo> urlList = thirdPartyServiceFeign.querylist(query);
|
||||||
|
if (urlList != null && urlList.size() > 0) {
|
||||||
|
url = urlList.get(0).getInterfaceType();
|
||||||
|
} else {
|
||||||
|
throw new ServiceException("未找到该组织的推送地址!");
|
||||||
|
}
|
||||||
String invoiceNumber="";
|
String invoiceNumber="";
|
||||||
R<TmsInvoiceListDetailsVO> ajaxResult2=wlhyServiceFeign.selectInvoiceListById(reconciliation.getInvoiceId());
|
R<TmsInvoiceListDetailsVO> ajaxResult2=wlhyServiceFeign.selectInvoiceListById(reconciliation.getInvoiceId());
|
||||||
if(ajaxResult2.getCode()==200){
|
if(ajaxResult2.getCode()==200){
|
||||||
@@ -564,7 +578,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
|||||||
reconciliation.setNcId("ys"+String.valueOf(reconciliation.getReconciliationId()));
|
reconciliation.setNcId("ys"+String.valueOf(reconciliation.getReconciliationId()));
|
||||||
//reconciliationMapper.updateById(reconciliation);
|
//reconciliationMapper.updateById(reconciliation);
|
||||||
CloseableHttpClient httpClient = HttpClients.createDefault();
|
CloseableHttpClient httpClient = HttpClients.createDefault();
|
||||||
HttpPost httpPost = new HttpPost(zsurl);
|
HttpPost httpPost = new HttpPost(url);
|
||||||
StringEntity postingString = new StringEntity(xmlString, "UTF-8");
|
StringEntity postingString = new StringEntity(xmlString, "UTF-8");
|
||||||
httpPost.setEntity(postingString);
|
httpPost.setEntity(postingString);
|
||||||
httpPost.setHeader("Content-type", "application/xml");
|
httpPost.setHeader("Content-type", "application/xml");
|
||||||
@@ -625,6 +639,17 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
|||||||
throw new ServiceException("该记录还未开票,不允许同步");
|
throw new ServiceException("该记录还未开票,不允许同步");
|
||||||
}
|
}
|
||||||
if(result.getCode()==200){
|
if(result.getCode()==200){
|
||||||
|
String url = "";
|
||||||
|
SysDepartInterfaceInfoDTO query= new SysDepartInterfaceInfoDTO();
|
||||||
|
query.setOrganizationId(reconciliation.getOrganizationId());
|
||||||
|
query.setOrganizationName(reconciliation.getOrganizationName());
|
||||||
|
query.setInterfaceType("nc");
|
||||||
|
List<SysDepartInterfaceInfoPo> urlList = thirdPartyServiceFeign.querylist(query);
|
||||||
|
if (urlList != null && urlList.size() > 0) {
|
||||||
|
url = urlList.get(0).getInterfaceType();
|
||||||
|
} else {
|
||||||
|
throw new ServiceException("未找到该组织的推送地址!");
|
||||||
|
}
|
||||||
List<TmsOrder> list=result.getData();
|
List<TmsOrder> list=result.getData();
|
||||||
if(ObjectUtil.isNotNull(list)){
|
if(ObjectUtil.isNotNull(list)){
|
||||||
makerCodeNc=list.get(0).getMakerCodeNc();
|
makerCodeNc=list.get(0).getMakerCodeNc();
|
||||||
@@ -872,6 +897,17 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
|||||||
String makerCodeNc="";
|
String makerCodeNc="";
|
||||||
if(reconciliation.getOrganizationName().contains("南岐")){
|
if(reconciliation.getOrganizationName().contains("南岐")){
|
||||||
R<List<TmsOrder>> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO);
|
R<List<TmsOrder>> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO);
|
||||||
|
String url = "";
|
||||||
|
SysDepartInterfaceInfoDTO query= new SysDepartInterfaceInfoDTO();
|
||||||
|
query.setOrganizationId(reconciliation.getOrganizationId());
|
||||||
|
query.setOrganizationName(reconciliation.getOrganizationName());
|
||||||
|
query.setInterfaceType("nc");
|
||||||
|
List<SysDepartInterfaceInfoPo> urlList = thirdPartyServiceFeign.querylist(query);
|
||||||
|
if (urlList != null && urlList.size() > 0) {
|
||||||
|
url = urlList.get(0).getInterfaceType();
|
||||||
|
} else {
|
||||||
|
throw new ServiceException("未找到该组织的推送地址!");
|
||||||
|
}
|
||||||
if(result.getCode()==200){
|
if(result.getCode()==200){
|
||||||
List<TmsOrder> list=result.getData();
|
List<TmsOrder> list=result.getData();
|
||||||
if(ObjectUtil.isNotNull(list)){
|
if(ObjectUtil.isNotNull(list)){
|
||||||
@@ -971,7 +1007,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
|||||||
reconciliation.setSkNcId("sk"+String.valueOf(reconciliation.getReconciliationId()));
|
reconciliation.setSkNcId("sk"+String.valueOf(reconciliation.getReconciliationId()));
|
||||||
//reconciliationMapper.updateById(reconciliation);
|
//reconciliationMapper.updateById(reconciliation);
|
||||||
CloseableHttpClient httpClient = HttpClients.createDefault();
|
CloseableHttpClient httpClient = HttpClients.createDefault();
|
||||||
HttpPost httpPost = new HttpPost(zsurl);
|
HttpPost httpPost = new HttpPost(url);
|
||||||
StringEntity postingString = new StringEntity(xmlString, "UTF-8");
|
StringEntity postingString = new StringEntity(xmlString, "UTF-8");
|
||||||
httpPost.setEntity(postingString);
|
httpPost.setEntity(postingString);
|
||||||
httpPost.setHeader("Content-type", "application/xml");
|
httpPost.setHeader("Content-type", "application/xml");
|
||||||
@@ -1027,6 +1063,17 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
|
|||||||
}
|
}
|
||||||
}else if(reconciliation.getOrganizationName().contains("通宇")){
|
}else if(reconciliation.getOrganizationName().contains("通宇")){
|
||||||
R<List<TmsOrder>> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO);
|
R<List<TmsOrder>> result=wlhyServiceFeign.getOrderListByReconciliation(reconciliationDTO);
|
||||||
|
String url = "";
|
||||||
|
SysDepartInterfaceInfoDTO query= new SysDepartInterfaceInfoDTO();
|
||||||
|
query.setOrganizationId(reconciliation.getOrganizationId());
|
||||||
|
query.setOrganizationName(reconciliation.getOrganizationName());
|
||||||
|
query.setInterfaceType("nc");
|
||||||
|
List<SysDepartInterfaceInfoPo> urlList = thirdPartyServiceFeign.querylist(query);
|
||||||
|
if (urlList != null && urlList.size() > 0) {
|
||||||
|
url = urlList.get(0).getInterfaceType();
|
||||||
|
} else {
|
||||||
|
throw new ServiceException("未找到该组织的推送地址!");
|
||||||
|
}
|
||||||
if(result.getCode()==200){
|
if(result.getCode()==200){
|
||||||
List<TmsOrder> list=result.getData();
|
List<TmsOrder> list=result.getData();
|
||||||
if(ObjectUtil.isNotNull(list)){
|
if(ObjectUtil.isNotNull(list)){
|
||||||
|
|||||||
Reference in New Issue
Block a user