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 b8cc5ad33..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 @@ -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).getInterfaceTypeValue(); + } 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).getInterfaceTypeValue(); + } 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).getInterfaceTypeValue(); + } 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).getInterfaceTypeValue(); + } else { + throw new ServiceException("未找到该组织的推送地址!"); + } if(result.getCode()==200){ List list=result.getData(); if(ObjectUtil.isNotNull(list)){ @@ -1208,4 +1255,4 @@ public class ReconciliationImpl extends ServiceImplDEFAULT + #{waybillSource}, #{waybillSourceName}, #{reconciliationStart}, #{reconciliationEnd}, @@ -303,8 +304,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{receivable}, #{actualReceivable}, #{uncollectedReceivable}, - #{collectionState}, - #{auditState}, + DEFAULT + #{collectionState}, + DEFAULT + #{auditState}, #{createTime}, #{createBy}, #{createByName}, @@ -328,23 +331,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 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