From 73348d8469235a4e9279704b04103dc713b31128 Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Wed, 10 Jun 2026 19:27:28 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=8E=A8=E9=80=81=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessDocumentOrderApplicationService.java | 6 +++++- .../BusinessPartnerApplicationService.java | 9 ++++++++- .../erpCountry/ErpCountryApplicationService.java | 10 +++++++++- .../ErpEnterpriseUnitApplicationService.java | 10 +++++++++- .../exchangeRate/ExchangeRateApplicationService.java | 10 +++++++++- .../materialInfo/MaterialInfoApplicationService.java | 10 +++++++++- .../repository/mapper/BusinessDocumentOrderMapper.java | 2 ++ .../ReservationStockInOrderApplicationService.java | 2 +- .../BusinessDocumentOrderMapper.xml | 4 ++++ .../domain/organization/entity/Organization.java | 3 ++- 10 files changed, 58 insertions(+), 8 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java index d594a8edf..bea3d947f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessDocumentOrder/BusinessDocumentOrderApplicationService.java @@ -189,6 +189,10 @@ public class BusinessDocumentOrderApplicationService { Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; + // 查询组织对应的推送签名，没有则用全局默认 + String orgPushVerify = organizationId != null ? businessDocumentOrderMapper.getPushVerifyByOrgId(organizationId) : null; + String finalVerifyKey = orgPushVerify != null ? orgPushVerify : verifyKey; + int successCount = 0; int failCount = 0; StringBuilder failMsg = new StringBuilder(); @@ -304,7 +308,7 @@ public class BusinessDocumentOrderApplicationService { httpPost.setEntity(postingString); httpPost.setHeader("Content-type", "application/json"); - httpPost.setHeader("verify", verifyKey); + httpPost.setHeader("verify", finalVerifyKey); if ("I".equals(order.getIeType())) { httpPost.setHeader("apiName", API_NAME_I); } else if ("E".equals(order.getIeType())) { diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java index f5bbd1b82..03002c638 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java @@ -9,6 +9,7 @@ import com.mhd.common.core.web.page.TableDataInfo; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.oms.domain.gwLog.entity.GwLog; import com.mhd.oms.domain.gwLog.repository.mapper.GwLogMapper; +import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper; import com.mhd.oms.interfaces.dto.businessPartner.BusinessPartnerDTO; import com.mhd.system.api.UserServiceFeign; import com.mhd.system.api.domain.UserShipperQueryDTO; @@ -45,6 +46,8 @@ public class BusinessPartnerApplicationService { @Resource private GwLogMapper gwLogMapper; + @Resource + private BusinessDocumentOrderMapper businessDocumentOrderMapper; @@ -86,6 +89,10 @@ public class BusinessPartnerApplicationService { Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; + // 查询组织对应的推送签名，没有则用全局默认 + String orgPushVerify = organizationId != null ? businessDocumentOrderMapper.getPushVerifyByOrgId(organizationId) : null; + String finalVerifyKey = orgPushVerify != null ? orgPushVerify : verifyKey; + int successCount = 0; int failCount = 0; StringBuilder failMsg = new StringBuilder(); @@ -124,7 +131,7 @@ public class BusinessPartnerApplicationService { httpPost.setEntity(postingString); httpPost.setHeader("Content-type", "application/json"); httpPost.setHeader("apiName", API_NAME); - httpPost.setHeader("verify", verifyKey); + httpPost.setHeader("verify", finalVerifyKey); try{ CloseableHttpResponse response = httpClient.execute(httpPost); String responseString = EntityUtils.toString(response.getEntity()); diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/erpCountry/ErpCountryApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/erpCountry/ErpCountryApplicationService.java index 378c091b9..8a02f2189 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/erpCountry/ErpCountryApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/erpCountry/ErpCountryApplicationService.java @@ -12,6 +12,7 @@ import com.mhd.oms.domain.erpCountry.repository.mapper.ErpCountryMapper; import com.mhd.oms.domain.erpCountry.repository.po.ErpCountryPO; import com.mhd.oms.domain.gwLog.entity.GwLog; import com.mhd.oms.domain.gwLog.repository.mapper.GwLogMapper; +import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper; import com.mhd.oms.interfaces.dto.erpCountry.ErpCountryDTO; import com.mhd.system.api.model.LoginUser; import lombok.extern.slf4j.Slf4j; @@ -46,6 +47,9 @@ public class ErpCountryApplicationService{ @Resource private GwLogMapper gwLogMapper; + @Resource + private BusinessDocumentOrderMapper businessDocumentOrderMapper; + public TableDataInfo queryList(ErpCountryDTO erpCountryDTO) { LoginUser loginUser = SecurityUtils.getLoginUser(); if (loginUser != null) { @@ -133,6 +137,10 @@ public class ErpCountryApplicationService{ Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; + // 查询组织对应的推送签名，没有则用全局默认 + String orgPushVerify = organizationId != null ? businessDocumentOrderMapper.getPushVerifyByOrgId(organizationId) : null; + String finalVerifyKey = orgPushVerify != null ? orgPushVerify : verifyKey; + int successCount = 0; int failCount = 0; StringBuilder failMsg = new StringBuilder(); @@ -172,7 +180,7 @@ public class ErpCountryApplicationService{ httpPost.setEntity(postingString); httpPost.setHeader("Content-type", "application/json"); httpPost.setHeader("apiName", API_NAME); - httpPost.setHeader("verify", verifyKey); + httpPost.setHeader("verify", finalVerifyKey); try { CloseableHttpResponse response = httpClient.execute(httpPost); diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java index 53cee8665..0c25827dc 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/erpEnterpriseUnit/ErpEnterpriseUnitApplicationService.java @@ -14,6 +14,7 @@ import com.mhd.oms.domain.erpEnterpriseUnit.repository.po.ErpEnterpriseUnitPO; import com.mhd.oms.domain.erpEnterpriseUnit.repository.todo.ErpEnterpriseUnitDO; import com.mhd.oms.domain.gwLog.entity.GwLog; import com.mhd.oms.domain.gwLog.repository.mapper.GwLogMapper; +import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper; import com.mhd.oms.interfaces.dto.erpEnterpriseUnit.ErpEnterpriseUnitDTO; import com.mhd.system.api.model.LoginUser; import lombok.extern.slf4j.Slf4j; @@ -48,6 +49,9 @@ public class ErpEnterpriseUnitApplicationService { @Resource private GwLogMapper gwLogMapper; + @Resource + private BusinessDocumentOrderMapper businessDocumentOrderMapper; + public TableDataInfo queryList(ErpEnterpriseUnitDO erpEnterpriseUnitDO) { LoginUser loginUser = SecurityUtils.getLoginUser(); if (loginUser != null) { @@ -117,6 +121,10 @@ public class ErpEnterpriseUnitApplicationService { Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; + // 查询组织对应的推送签名，没有则用全局默认 + String orgPushVerify = organizationId != null ? businessDocumentOrderMapper.getPushVerifyByOrgId(organizationId) : null; + String finalVerifyKey = orgPushVerify != null ? orgPushVerify : verifyKey; + int successCount = 0; int failCount = 0; StringBuilder failMsg = new StringBuilder(); @@ -156,7 +164,7 @@ public class ErpEnterpriseUnitApplicationService { httpPost.setEntity(postingString); httpPost.setHeader("Content-type", "application/json"); httpPost.setHeader("apiName", API_NAME); - httpPost.setHeader("verify", verifyKey); + httpPost.setHeader("verify", finalVerifyKey); try { CloseableHttpResponse response = httpClient.execute(httpPost); diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/exchangeRate/ExchangeRateApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/exchangeRate/ExchangeRateApplicationService.java index 2c6fbf7b7..e691b533d 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/exchangeRate/ExchangeRateApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/exchangeRate/ExchangeRateApplicationService.java @@ -8,6 +8,7 @@ import com.mhd.common.core.web.page.TableDataInfo; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.oms.domain.gwLog.entity.GwLog; import com.mhd.oms.domain.gwLog.repository.mapper.GwLogMapper; +import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper; import com.mhd.oms.interfaces.dto.exchangeRate.ExchangeRateDTO; import com.mhd.system.api.WlhyServiceFeign; import com.mhd.system.api.model.LoginUser; @@ -44,6 +45,9 @@ public class ExchangeRateApplicationService { @Resource private GwLogMapper gwLogMapper; + @Resource + private BusinessDocumentOrderMapper businessDocumentOrderMapper; + public TableDataInfo queryExchangeRateList(Integer pageNum, Integer pageSize, String pushStatus, String organizationId) { try { log.info("查询汇率列表: pageNum={}, pageSize={}, pushStatus={}, organizationId={}", @@ -96,6 +100,10 @@ public class ExchangeRateApplicationService { Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; + // 查询组织对应的推送签名，没有则用全局默认 + String orgPushVerify = organizationId != null ? businessDocumentOrderMapper.getPushVerifyByOrgId(organizationId) : null; + String finalVerifyKey = orgPushVerify != null ? orgPushVerify : verifyKey; + int successCount = 0; int failCount = 0; StringBuilder failMsg = new StringBuilder(); @@ -133,7 +141,7 @@ public class ExchangeRateApplicationService { httpPost.setEntity(postingString); httpPost.setHeader("Content-type", "application/json"); httpPost.setHeader("apiName", API_NAME); - httpPost.setHeader("verify", verifyKey); + httpPost.setHeader("verify", finalVerifyKey); try { CloseableHttpResponse response = httpClient.execute(httpPost); diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java index 698366631..59ba8c9a8 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/materialInfo/MaterialInfoApplicationService.java @@ -9,6 +9,7 @@ import com.mhd.common.core.web.page.TableDataInfo; import com.mhd.common.security.utils.SecurityUtils; import com.mhd.oms.domain.gwLog.entity.GwLog; import com.mhd.oms.domain.gwLog.repository.mapper.GwLogMapper; +import com.mhd.oms.domain.businessDocumentOrder.repository.mapper.BusinessDocumentOrderMapper; import com.mhd.system.api.WmsServiceFeign; import com.mhd.system.api.domain.MaterialInfoDTO; import com.mhd.system.api.model.LoginUser; @@ -41,6 +42,9 @@ public class MaterialInfoApplicationService { @Resource private GwLogMapper gwLogMapper; + @Resource + private BusinessDocumentOrderMapper businessDocumentOrderMapper; + private final WmsServiceFeign wmsServiceFeign; public MaterialInfoApplicationService(WmsServiceFeign wmsServiceFeign) { @@ -77,6 +81,10 @@ public class MaterialInfoApplicationService { Long topOrganizationId = loginUser != null ? loginUser.getUserPo().getTopOrganizationId() : null; String organizationName = loginUser != null ? loginUser.getUserPo().getOrganizationName() : null; + // 查询组织对应的推送签名，没有则用全局默认 + String orgPushVerify = organizationId != null ? businessDocumentOrderMapper.getPushVerifyByOrgId(organizationId) : null; + String finalVerifyKey = orgPushVerify != null ? orgPushVerify : verifyKey; + int successCount = 0; int failCount = 0; StringBuilder failMsg = new StringBuilder(); @@ -123,7 +131,7 @@ public class MaterialInfoApplicationService { httpPost.setEntity(postingString); httpPost.setHeader("Content-type", "application/json"); httpPost.setHeader("apiName", API_NAME); - httpPost.setHeader("verify", verifyKey); + httpPost.setHeader("verify", finalVerifyKey); try { CloseableHttpResponse response = httpClient.execute(httpPost); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/mapper/BusinessDocumentOrderMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/mapper/BusinessDocumentOrderMapper.java index b8b338533..5d887bacd 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/mapper/BusinessDocumentOrderMapper.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/mapper/BusinessDocumentOrderMapper.java @@ -35,4 +35,6 @@ public interface BusinessDocumentOrderMapper extends BaseMapper + + diff --git a/mhd_product/src/main/java/com/linke/product/domain/organization/entity/Organization.java b/mhd_product/src/main/java/com/linke/product/domain/organization/entity/Organization.java index 668673a56..31f991907 100644 --- a/mhd_product/src/main/java/com/linke/product/domain/organization/entity/Organization.java +++ b/mhd_product/src/main/java/com/linke/product/domain/organization/entity/Organization.java @@ -116,6 +116,7 @@ public class Organization extends BaseVOEntity implements Serializable { private String ncCode; @ApiModelProperty("是否排队：0-否，1-是") private Integer isQueue; - + @ApiModelProperty("推送验证密钥") + private String pushVerify; } \ No newline at end of file From d63191829eb890c3229e09931f7b7a5e6bfc8a84 Mon Sep 17 00:00:00 2001 From: zhaoqing <1670883518@qq.com> Date: Wed, 10 Jun 2026 19:31:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../businessPartner/BusinessPartnerApplicationService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java index 03002c638..d09d1c797 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/application/service/businessPartner/BusinessPartnerApplicationService.java @@ -103,6 +103,7 @@ public class BusinessPartnerApplicationService { Map item = new HashMap<>(); item.put("corpCode", businessPartnerDTO.getCorpCode()); item.put("corpName", businessPartnerDTO.getCorpName()); + item.put("stopFlag", "0"); // 包装成数组 List> bodyList = new ArrayList<>();