weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
赵辉
2026-03-06 16:34:08 +08:00
parent 33a62a6a68 41f7898d17
commit 81adc97084
5 changed files with 90 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_finance/src/main/java/com/linke/finance/domain/reconciliation/repository/persistence/ReconciliationImpl.java
+52 -5
View File
@@ -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<ReconciliationMapper, Reconc
@Autowired
private TmsReceiptMapper tmsReceiptMapper;
//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正式环境地址
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="";
if(reconciliation.getOrganizationName().contains("南岐")){
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).getInterfaceTypeValue();
} else {
throw new ServiceException("未找到该组织的推送地址!");
}
String invoiceNumber="";
R<TmsInvoiceListDetailsVO> ajaxResult2=wlhyServiceFeign.selectInvoiceListById(reconciliation.getInvoiceId());
if(ajaxResult2.getCode()==200){
@@ -564,7 +578,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
reconciliation.setNcId("ys"+String.valueOf(reconciliation.getReconciliationId()));
//reconciliationMapper.updateById(reconciliation);
CloseableHttpClient httpClient = HttpClients.createDefault();
HttpPost httpPost = new HttpPost(zsurl);
HttpPost httpPost = new HttpPost(url);
StringEntity postingString = new StringEntity(xmlString, "UTF-8");
httpPost.setEntity(postingString);
httpPost.setHeader("Content-type", "application/xml");
@@ -625,6 +639,17 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
throw new ServiceException("该记录还未开票，不允许同步");
}
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).getInterfaceTypeValue();
} else {
throw new ServiceException("未找到该组织的推送地址!");
}
List<TmsOrder> list=result.getData();
if(ObjectUtil.isNotNull(list)){
makerCodeNc=list.get(0).getMakerCodeNc();
@@ -872,6 +897,17 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
String makerCodeNc="";
if(reconciliation.getOrganizationName().contains("南岐")){
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).getInterfaceTypeValue();
} else {
throw new ServiceException("未找到该组织的推送地址!");
}
if(result.getCode()==200){
List<TmsOrder> list=result.getData();
if(ObjectUtil.isNotNull(list)){
@@ -971,7 +1007,7 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
reconciliation.setSkNcId("sk"+String.valueOf(reconciliation.getReconciliationId()));
//reconciliationMapper.updateById(reconciliation);
CloseableHttpClient httpClient = HttpClients.createDefault();
HttpPost httpPost = new HttpPost(zsurl);
HttpPost httpPost = new HttpPost(url);
StringEntity postingString = new StringEntity(xmlString, "UTF-8");
httpPost.setEntity(postingString);
httpPost.setHeader("Content-type", "application/xml");
@@ -1027,6 +1063,17 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
}
}else if(reconciliation.getOrganizationName().contains("通宇")){
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).getInterfaceTypeValue();
} else {
throw new ServiceException("未找到该组织的推送地址!");
}
if(result.getCode()==200){
List<TmsOrder> list=result.getData();
if(ObjectUtil.isNotNull(list)){
@@ -1208,4 +1255,4 @@ public class ReconciliationImpl extends ServiceImpl<ReconciliationMapper, Reconc
}
return true;
}
}
}
mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml
+17 -9
View File
@@ -292,7 +292,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{departmentName},
#{userId},
#{shipperName},
#{waybillSource},
<if test="waybillSource == null">DEFAULT</if>
<if test="waybillSource != null">#{waybillSource}</if>,
#{waybillSourceName},
#{reconciliationStart},
#{reconciliationEnd},
@@ -303,8 +304,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{receivable},
#{actualReceivable},
#{uncollectedReceivable},
#{collectionState},
#{auditState},
<if test="collectionState == null">DEFAULT</if>
<if test="collectionState != null">#{collectionState}</if>,
<if test="auditState == null">DEFAULT</if>
<if test="auditState != null">#{auditState}</if>,
#{createTime},
#{createBy},
#{createByName},
@@ -328,23 +331,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{invoiceApplyStatus},
#{invoiceInfoId},
#{auditNumber},
#{auditStatus},
<if test="auditStatus == null">DEFAULT</if>
<if test="auditStatus != null">#{auditStatus}</if>,
#{auditType},
#{auditRemark},
#{instanceId},
#{approvalStatus},
<if test="approvalStatus == null">DEFAULT</if>
<if test="approvalStatus != null">#{approvalStatus}</if>,
#{approvalResult},
#{isInvoice},
<if test="isInvoice == null">DEFAULT</if>
<if test="isInvoice != null">#{isInvoice}</if>,
#{invoiceId},
#{invoiceMakeTime},
#{applyNumber},
#{synchronousStatus},
<if test="synchronousStatus == null">DEFAULT</if>
<if test="synchronousStatus != null">#{synchronousStatus}</if>,
#{synchronousTime},
#{ncId},
#{skSynchronousStatus},
<if test="skSynchronousStatus == null">DEFAULT</if>
<if test="skSynchronousStatus != null">#{skSynchronousStatus}</if>,
#{skSynchronousTime},
#{skNcId},
#{accountInformation}
)
</insert>
</mapper>
</mapper>