From afc265c4a37b3b683569b918a5842ee0fe081bd8 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Tue, 24 Sep 2024 09:59:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=89=A7=E8=A1=8C=E8=BF=94=E5=9B=9E=E7=BB=93?= =?UTF-8?q?=E6=9E=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/lets/plugin/adjust/AdjustInPluginInitializer.java | 3 ++- .../plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java | 3 ++- .../plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java | 3 ++- .../plugin/lets/plugin/adjust/OtherInPluginInitializer.java | 3 ++- .../plugin/lets/plugin/adjust/OtherOutPluginInitializer.java | 3 ++- .../lets/plugin/base/GoodsAutoAllotPluginInitializer.java | 3 ++- .../frame/plugin/lets/plugin/base/KitPluginInitializer.java | 3 ++- .../plugin/lets/plugin/base/SKUClassPluginInitializer.java | 3 ++- .../frame/plugin/lets/plugin/base/SKUPluginInitializer.java | 3 ++- .../plugin/lets/plugin/base/SKUSealPluginInitializer.java | 3 ++- .../lets/plugin/transfer/TransferInPluginInitializer.java | 3 ++- .../lets/plugin/transfer/TransferOutPluginInitializer.java | 3 ++- .../hzya/frame/plugin/lets/plugin/transfer/TransferTest.java | 2 +- 13 files changed, 25 insertions(+), 13 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java index 5150b61f..d6345ab6 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInPluginInitializer.java @@ -28,6 +28,7 @@ import com.hzya.frame.ttxofs.dto.InterfaceParamDto; import com.hzya.frame.ttxofs.dto.ofsTransferOrderSearch.OFSAdjustOrderSearchResponse; import com.hzya.frame.ttxofs.dto.stock.StockinOrderSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -131,7 +132,7 @@ public class AdjustInPluginInitializer extends PluginBaseEntity { e.printStackTrace(); logger.error("executeBusiness方法抛出异常", e); } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java index d0cbb433..80a37ea2 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustInZZPluginInitializer.java @@ -29,6 +29,7 @@ import com.hzya.frame.ttxofs.dto.InterfaceParamDto; import com.hzya.frame.ttxofs.dto.ofsTransferOrderSearch.OFSAdjustOrderSearchResponse; import com.hzya.frame.ttxofs.dto.stock.StockinOrderSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -134,7 +135,7 @@ public class AdjustInZZPluginInitializer extends PluginBaseEntity { e.printStackTrace(); logger.error("executeBusiness方法抛出异常", e); } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java index dedf08e4..f6d49852 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/AdjustOutPluginInitializer.java @@ -35,6 +35,7 @@ import com.hzya.frame.ttxofs.dto.stock.StockinOrderSearchResponse; import com.hzya.frame.ttxofs.dto.stock.StockoutOrderSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; import com.hzya.frame.u8c.ax.entity.Ass; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -136,7 +137,7 @@ public class AdjustOutPluginInitializer extends PluginBaseEntity { e.printStackTrace(); logger.error("executeBusiness方法抛出异常", e); } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/OtherInPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/OtherInPluginInitializer.java index 3ae80351..1907a993 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/OtherInPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/OtherInPluginInitializer.java @@ -23,6 +23,7 @@ import com.hzya.frame.plugin.lets.util.pushData.ZTResult; import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -118,7 +119,7 @@ public class OtherInPluginInitializer extends PluginBaseEntity { e.printStackTrace(); logger.error("executeBusiness方法抛出异常", e); } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } public void start(){ diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/OtherOutPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/OtherOutPluginInitializer.java index 12b0cbcd..227aec6c 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/OtherOutPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/adjust/OtherOutPluginInitializer.java @@ -24,6 +24,7 @@ import com.hzya.frame.plugin.lets.util.pushData.ZTResult; import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -122,7 +123,7 @@ public class OtherOutPluginInitializer extends PluginBaseEntity { e.printStackTrace(); logger.error("executeBusiness方法抛出异常", e); } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } public void start(){ diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/GoodsAutoAllotPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/GoodsAutoAllotPluginInitializer.java index a19cf388..c7a7c2e0 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/GoodsAutoAllotPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/GoodsAutoAllotPluginInitializer.java @@ -23,6 +23,7 @@ import com.hzya.frame.plugin.lets.util.pushData.ZTResult; import com.hzya.frame.sysnew.integtationTaskLivingDetails.dao.IIntegrationTaskLivingDetailsDao; import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTaskLivingDetailsEntity; import com.hzya.frame.u8c.ax.entity.Ass; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -118,7 +119,7 @@ public class GoodsAutoAllotPluginInitializer extends PluginBaseEntity { e.printStackTrace(); logger.error("executeBusiness方法抛出异常", e); } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/KitPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/KitPluginInitializer.java index ed034441..1e9971ad 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/KitPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/KitPluginInitializer.java @@ -27,6 +27,7 @@ import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTask import com.hzya.frame.ttxofs.dto.InterfaceParamByU8CApiDto; import com.hzya.frame.ttxofs.dto.kit.OfsKitOrderSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -129,7 +130,7 @@ public class KitPluginInitializer extends PluginBaseEntity { e.printStackTrace(); logger.error("executeBusiness方法抛出异常", e); } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUClassPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUClassPluginInitializer.java index 7fa7811f..6269225a 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUClassPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUClassPluginInitializer.java @@ -26,6 +26,7 @@ import com.hzya.frame.ttxofs.basics.ReturnMessageBasics; import com.hzya.frame.ttxofs.dto.InterfaceParamByU8CApiDto; import com.hzya.frame.ttxofs.dto.ofsBaseSearch.OFSSKUClassSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -138,7 +139,7 @@ public class SKUClassPluginInitializer extends PluginBaseEntity { e.printStackTrace(); logger.error("executeBusiness方法抛出异常", e); } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUPluginInitializer.java index 7643665f..24de1d60 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUPluginInitializer.java @@ -26,6 +26,7 @@ import com.hzya.frame.ttxofs.basics.ReturnMessageBasics; import com.hzya.frame.ttxofs.dto.InterfaceParamByU8CApiDto; import com.hzya.frame.ttxofs.dto.ofsBaseSearch.OFSSKUSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -130,7 +131,7 @@ public class SKUPluginInitializer extends PluginBaseEntity { e.printStackTrace(); logger.error("executeBusiness方法抛出异常", e); } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUSealPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUSealPluginInitializer.java index 32a73a91..3e4aef36 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUSealPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SKUSealPluginInitializer.java @@ -25,6 +25,7 @@ import com.hzya.frame.sysnew.integtationTaskLivingDetails.entity.IntegrationTask import com.hzya.frame.ttxofs.dto.InterfaceParamByU8CApiDto; import com.hzya.frame.ttxofs.dto.ofsBaseSearch.OFSSKUSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -126,7 +127,7 @@ public class SKUSealPluginInitializer extends PluginBaseEntity { e.printStackTrace(); logger.error("executeBusiness方法抛出异常", e); } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java index 3b000ff4..1e943590 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferInPluginInitializer.java @@ -34,6 +34,7 @@ import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.SaleOutReturnMessageDto; import com.hzya.frame.ttxofs.dto.stock.StockinOrderSearchResponse; import com.hzya.frame.ttxofs.dto.stock.StockoutOrderSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -137,7 +138,7 @@ public class TransferInPluginInitializer extends PluginBaseEntity { e.printStackTrace(); logger.error("executeBusiness方法抛出异常", e); } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java index 829ac881..f79a758a 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferOutPluginInitializer.java @@ -38,6 +38,7 @@ import com.hzya.frame.ttxofs.dto.ofssaleorderoutsearch.SaleOutReturnMessageDto; import com.hzya.frame.ttxofs.dto.stock.StockinOrderSearchResponse; import com.hzya.frame.ttxofs.dto.stock.StockoutOrderSearchResponse; import com.hzya.frame.ttxofs.service.OfsUnifiedService; +import com.hzya.frame.web.entity.BaseResult; import com.hzya.frame.web.entity.JsonResultEntity; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -141,7 +142,7 @@ public class TransferOutPluginInitializer extends PluginBaseEntity { e.printStackTrace(); logger.error("executeBusiness方法抛出异常", e); } - return null; + return BaseResult.getSuccessMessageEntity("插件执行成功"); } diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java index b129eb66..51e73930 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/transfer/TransferTest.java @@ -131,7 +131,7 @@ public class TransferTest { ////////////////////////////////////////////////////////////////////////////////////仅退款 @Test public void t80(){ - refundOnlyPluginInitializer.start("LETS-RO2024012600005007"); + refundOnlyPluginInitializer.start("LETS-RO2024091900000001"); } ////////////////////////////////////////////////////////////////////////////////////仅退款