From 624b081cc4367fdd80cefe81eb958f839dbeb7c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 6 Mar 2026 15:13:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=BA=94=E6=94=B6?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E6=95=B0=E6=8D=AE=E5=BA=93=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E4=B8=8D=E7=94=9F=E6=95=88=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reconciliation/ReconciliationMapper.xml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml b/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml index 09e07e987..1660f94c4 100644 --- a/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml +++ b/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml @@ -325,23 +325,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{invoiceApplyStatus}, #{invoiceInfoId}, #{auditNumber}, - #{auditStatus}, + DEFAULT + #{auditStatus}, #{auditType}, #{auditRemark}, #{instanceId}, - #{approvalStatus}, + DEFAULT + #{approvalStatus}, #{approvalResult}, - #{isInvoice}, + DEFAULT + #{isInvoice}, #{invoiceId}, #{invoiceMakeTime}, #{applyNumber}, - #{synchronousStatus}, + DEFAULT + #{synchronousStatus}, #{synchronousTime}, #{ncId}, - #{skSynchronousStatus}, + DEFAULT + #{skSynchronousStatus}, #{skSynchronousTime}, #{skNcId}, #{accountInformation} ) - + \ No newline at end of file From ffcb1ef79249494b0f4c22dbf344ad1416060bee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 6 Mar 2026 15:20:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=BA=94=E6=94=B6?= =?UTF-8?q?=E8=B4=A6=E5=8D=95=E6=95=B0=E6=8D=AE=E5=BA=93=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E4=B8=8D=E7=94=9F=E6=95=88=E4=BF=AE=E6=94=B9;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/reconciliation/ReconciliationMapper.xml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml b/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml index 1660f94c4..99c13e6a5 100644 --- a/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml +++ b/mhd_finance/src/main/resources/mapper/reconciliation/ReconciliationMapper.xml @@ -289,7 +289,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{departmentName}, #{userId}, #{shipperName}, - #{waybillSource}, + DEFAULT + #{waybillSource}, #{waybillSourceName}, #{reconciliationStart}, #{reconciliationEnd}, @@ -300,8 +301,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{receivable}, #{actualReceivable}, #{uncollectedReceivable}, - #{collectionState}, - #{auditState}, + DEFAULT + #{collectionState}, + DEFAULT + #{auditState}, #{createTime}, #{createBy}, #{createByName}, From 0b2340b135187fc19dbc569b9fb57a2d0b8bf53d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 6 Mar 2026 15:48:04 +0800 Subject: [PATCH 3/5] =?UTF-8?q?nc=E6=8E=A8=E9=80=81=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=BB=8E=E4=B8=89=E6=96=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=8E=B7=E5=8F=96;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/ReconciliationImpl.java | 57 +++++++++++++++++-- 1 file changed, 52 insertions(+), 5 deletions(-) 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 Date: Fri, 6 Mar 2026 16:09:06 +0800 Subject: [PATCH 4/5] =?UTF-8?q?nc=E6=8E=A8=E9=80=81=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=BB=8E=E4=B8=89=E6=96=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=8E=B7=E5=8F=96;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/feign/ThirdPartyServiceFeign.java | 6 +++++- .../persistence/ReconciliationImpl.java | 8 ++++---- .../mapper/organization/OrganizationMapper.xml | 2 +- .../facade/SysDepartInterfaceInfoApi.java | 16 +++++++++++++++- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java index f45b3e8d9..c800fe968 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/feign/ThirdPartyServiceFeign.java @@ -33,6 +33,10 @@ public interface ThirdPartyServiceFeign { @GetMapping("/sysDepartInterfaceInfo/querylist") public List querylist(@RequestBody SysDepartInterfaceInfoDTO sysDepartInterfaceInfoDTO); + //查询当前组织所有三方接口信息 + @GetMapping("/sysDepartInterfaceInfo/queryList") + public List queryList(@RequestBody SysDepartInterfaceInfoDTO sysDepartInterfaceInfoDTO); + //查询当前组织所有三方接口信息 @PostMapping("/sysDepartInterfaceInfo/queryListByFeign") public List queryListByFeign(@RequestBody SysDepartInterfaceInfoDTO sysDepartInterfaceInfoDTO); @@ -323,4 +327,4 @@ public interface ThirdPartyServiceFeign { //查询用户详情 @GetMapping("/dingtalkApi/v2/user/get") AjaxResult userGet(@RequestParam(value = "userId") String userId); -} +} \ No newline at end of file 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 2b32fab28..fb91c4632 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 @@ -441,7 +441,7 @@ public class ReconciliationImpl extends ServiceImpl urlList = thirdPartyServiceFeign.querylist(query); + List urlList = thirdPartyServiceFeign.queryList(query); if (urlList != null && urlList.size() > 0) { url = urlList.get(0).getInterfaceType(); } else { @@ -644,7 +644,7 @@ public class ReconciliationImpl extends ServiceImpl urlList = thirdPartyServiceFeign.querylist(query); + List urlList = thirdPartyServiceFeign.queryList(query); if (urlList != null && urlList.size() > 0) { url = urlList.get(0).getInterfaceType(); } else { @@ -902,7 +902,7 @@ public class ReconciliationImpl extends ServiceImpl urlList = thirdPartyServiceFeign.querylist(query); + List urlList = thirdPartyServiceFeign.queryList(query); if (urlList != null && urlList.size() > 0) { url = urlList.get(0).getInterfaceType(); } else { @@ -1068,7 +1068,7 @@ public class ReconciliationImpl extends ServiceImpl urlList = thirdPartyServiceFeign.querylist(query); + List urlList = thirdPartyServiceFeign.queryList(query); if (urlList != null && urlList.size() > 0) { url = urlList.get(0).getInterfaceType(); } else { diff --git a/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml b/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml index a07ba8746..537c77f9f 100644 --- a/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml +++ b/mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml @@ -382,4 +382,4 @@ - + \ No newline at end of file diff --git a/mhd_thrid_party/src/main/java/com/linke/thirdParty/interfaces/facade/SysDepartInterfaceInfoApi.java b/mhd_thrid_party/src/main/java/com/linke/thirdParty/interfaces/facade/SysDepartInterfaceInfoApi.java index df63066ee..1077c729f 100644 --- a/mhd_thrid_party/src/main/java/com/linke/thirdParty/interfaces/facade/SysDepartInterfaceInfoApi.java +++ b/mhd_thrid_party/src/main/java/com/linke/thirdParty/interfaces/facade/SysDepartInterfaceInfoApi.java @@ -138,6 +138,20 @@ public class SysDepartInterfaceInfoApi extends BaseController return list; } + + /** + * @Description 查询当前组织所有三方接口信息 + * @Author Alex + * @Date 2023/4/28 11:24 + */ + @GetMapping(value = "/queryList") + public List queryList(@RequestBody SysDepartInterfaceInfoDTO sysDepartInterfaceInfoDTO) { + SysDepartInterfaceInfoDo sysDepartInterfaceInfoDo = new SysDepartInterfaceInfoDo(); + BeanUtils.copyProperties(sysDepartInterfaceInfoDTO,sysDepartInterfaceInfoDo); + List list = sysDepartInterfaceInfoApplicationService.queryList(sysDepartInterfaceInfoDo); + return list; + } + /** * @Description 查询当前组织所有三方接口信息 * @Author Alex @@ -163,4 +177,4 @@ public class SysDepartInterfaceInfoApi extends BaseController return list; } -} +} \ No newline at end of file From 41f7898d17a2a8a8ddc17e84cdb72227468c7ccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Fri, 6 Mar 2026 16:13:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?nc=E6=8E=A8=E9=80=81=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=BB=8E=E4=B8=89=E6=96=B9=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E8=8E=B7=E5=8F=96;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/persistence/ReconciliationImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 fb91c4632..eb7c8c8a3 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 @@ -443,7 +443,7 @@ public class ReconciliationImpl extends ServiceImpl urlList = thirdPartyServiceFeign.queryList(query); if (urlList != null && urlList.size() > 0) { - url = urlList.get(0).getInterfaceType(); + url = urlList.get(0).getInterfaceTypeValue(); } else { throw new ServiceException("未找到该组织的推送地址!"); } @@ -646,7 +646,7 @@ public class ReconciliationImpl extends ServiceImpl urlList = thirdPartyServiceFeign.queryList(query); if (urlList != null && urlList.size() > 0) { - url = urlList.get(0).getInterfaceType(); + url = urlList.get(0).getInterfaceTypeValue(); } else { throw new ServiceException("未找到该组织的推送地址!"); } @@ -904,7 +904,7 @@ public class ReconciliationImpl extends ServiceImpl urlList = thirdPartyServiceFeign.queryList(query); if (urlList != null && urlList.size() > 0) { - url = urlList.get(0).getInterfaceType(); + url = urlList.get(0).getInterfaceTypeValue(); } else { throw new ServiceException("未找到该组织的推送地址!"); } @@ -1070,7 +1070,7 @@ public class ReconciliationImpl extends ServiceImpl urlList = thirdPartyServiceFeign.queryList(query); if (urlList != null && urlList.size() > 0) { - url = urlList.get(0).getInterfaceType(); + url = urlList.get(0).getInterfaceTypeValue(); } else { throw new ServiceException("未找到该组织的推送地址!"); }