From 6ffd5b765a9c259c130e4fa8c6a006108a52faaa Mon Sep 17 00:00:00 2001 From: sx <@sx.com> Date: Fri, 20 Sep 2024 14:02:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=97=A5=E5=BF=97=E6=BA=90?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../plugin/base/ShopPluginInitializer.java | 31 +++++++++---------- .../base/SupplierPluginInitializer.java | 9 +++--- 2 files changed, 18 insertions(+), 22 deletions(-) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/ShopPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/ShopPluginInitializer.java index 4fd25b00..7fbe8bea 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/ShopPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/ShopPluginInitializer.java @@ -169,8 +169,8 @@ public class ShopPluginInitializer extends PluginBaseEntity { OfsShopDto shopEntity = new OfsShopDto(); - shopEntity.setLastUpdated_start(startTimeStr); - shopEntity.setLastUpdated_end(endTimeStr); +// shopEntity.setLastUpdated_start(startTimeStr); +// shopEntity.setLastUpdated_end(endTimeStr); shopEntity.setPageNo("1"); shopEntity.setClientCode("LETS"); List list = queryfromofs(shopEntity); @@ -215,13 +215,12 @@ public class ShopPluginInitializer extends PluginBaseEntity { public void implementcustdoc(List shopEntityList) { Assert.notNull(shopEntityList, "shopEntityList不能为空"); - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date date = new Date(System.currentTimeMillis()); - String businessFormat = sdf.format(date); + String businessFormat = null; for (OfsShopDto shopEntity : shopEntityList) { + businessFormat=shopEntity.getLastUpdated(); String response = ""; try { + String lastUpdated = shopEntity.getLastUpdated(); CustdocEntityDto parentvo = new CustdocEntityDto(); CustdocRequestVo custdocRequestVo = new CustdocRequestVo(); @@ -273,7 +272,7 @@ public class ShopPluginInitializer extends PluginBaseEntity { integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); integrationTaskLivingDetailsEntity.setBusinessDate(businessFormat); integrationTaskLivingDetailsEntity.setRootAppPk(shopEntity.getBizCode()); - integrationTaskLivingDetailsEntity.setRootAppBill(shopEntity.getName()); + integrationTaskLivingDetailsEntity.setRootAppBill(shopEntity.getBizCode()); integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); @@ -288,7 +287,7 @@ public class ShopPluginInitializer extends PluginBaseEntity { integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); integrationTaskLivingDetailsEntity.setBusinessDate(businessFormat); integrationTaskLivingDetailsEntity.setRootAppPk(shopEntity.getBizCode()); - integrationTaskLivingDetailsEntity.setRootAppBill(shopEntity.getName()); + integrationTaskLivingDetailsEntity.setRootAppBill(shopEntity.getBizCode()); integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); @@ -299,12 +298,10 @@ public class ShopPluginInitializer extends PluginBaseEntity { public void implementdef(List shopEntityList) { Assert.notNull(shopEntityList, "shopEntityList不能为空"); - - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date date = new Date(System.currentTimeMillis()); - String businessFormat = sdf.format(date); + String businessFormat = null; for (OfsShopDto shopEntity : shopEntityList) { String response = ""; + businessFormat=shopEntity.getLastUpdated(); try { DefdocRequestVo defdocRequestVo = new DefdocRequestVo(); @@ -353,8 +350,8 @@ public class ShopPluginInitializer extends PluginBaseEntity { integrationTaskLivingDetailsEntity.setNewTransmitInfo(attribute.getData()); integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); integrationTaskLivingDetailsEntity.setBusinessDate(businessFormat); - integrationTaskLivingDetailsEntity.setRootAppPk("defdoc" + shopEntity.getBizCode()); - integrationTaskLivingDetailsEntity.setRootAppBill(shopEntity.getName()); + integrationTaskLivingDetailsEntity.setRootAppPk("defdoc_" + shopEntity.getBizCode()); + integrationTaskLivingDetailsEntity.setRootAppBill("defdoc_" +shopEntity.getBizCode()); integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); @@ -368,8 +365,8 @@ public class ShopPluginInitializer extends PluginBaseEntity { integrationTaskLivingDetailsEntity.setNewTransmitInfo(ErrMessage); integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); integrationTaskLivingDetailsEntity.setBusinessDate(businessFormat); - integrationTaskLivingDetailsEntity.setRootAppPk("defdoc" + shopEntity.getBizCode()); - integrationTaskLivingDetailsEntity.setRootAppBill(shopEntity.getName()); + integrationTaskLivingDetailsEntity.setRootAppPk("defdoc_" + shopEntity.getBizCode()); + integrationTaskLivingDetailsEntity.setRootAppBill("defdoc_" +shopEntity.getBizCode()); integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); @@ -415,7 +412,7 @@ public class ShopPluginInitializer extends PluginBaseEntity { if (ofsShopDto.getBizCode() != null && !"".equals(ofsShopDto.getBizCode().trim())) { boolean isExis = true; IntegrationTaskLivingDetailsEntity integrationTaskLivingDetailsEntity = new IntegrationTaskLivingDetailsEntity(); - integrationTaskLivingDetailsEntity.setRootAppPk("defdoc" + ofsShopDto.getBizCode()); + integrationTaskLivingDetailsEntity.setRootAppPk("defdoc_" + ofsShopDto.getBizCode()); integrationTaskLivingDetailsEntity.setNewState(ProfilesActiveConstant.LOG_STATUS_Y); integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); List integrationTaskLivingDetailsEntities = iIntegrationTaskLivingDetailsDao.query(integrationTaskLivingDetailsEntity); diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SupplierPluginInitializer.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SupplierPluginInitializer.java index a9548691..81cb8451 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SupplierPluginInitializer.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/base/SupplierPluginInitializer.java @@ -209,10 +209,9 @@ public class SupplierPluginInitializer extends PluginBaseEntity { Assert.notNull(shopEntityList, "shopEntityList不能为空"); //业务时间 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date date = new Date(System.currentTimeMillis()); - String businessFormat = sdf.format(date); + String businessFormat = null; for (OfsSupplierDto supplierEntity : shopEntityList) { + businessFormat=supplierEntity.getLastUpdated(); CustdocEntityDto parentvo = new CustdocEntityDto(); BankVo bankVo = new BankVo(); CustdocRequestVo CustdocEntityDto = new CustdocRequestVo(); @@ -262,7 +261,7 @@ public class SupplierPluginInitializer extends PluginBaseEntity { integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); integrationTaskLivingDetailsEntity.setBusinessDate(businessFormat); integrationTaskLivingDetailsEntity.setRootAppPk(supplierEntity.getBizCode()); - integrationTaskLivingDetailsEntity.setRootAppBill(supplierEntity.getName()); + integrationTaskLivingDetailsEntity.setRootAppBill(supplierEntity.getBizCode()); integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity); @@ -277,7 +276,7 @@ public class SupplierPluginInitializer extends PluginBaseEntity { integrationTaskLivingDetailsEntity.setNewPushDate(new Date()); integrationTaskLivingDetailsEntity.setBusinessDate(businessFormat); integrationTaskLivingDetailsEntity.setRootAppPk(supplierEntity.getBizCode()); - integrationTaskLivingDetailsEntity.setRootAppBill(supplierEntity.getName()); + integrationTaskLivingDetailsEntity.setRootAppBill(supplierEntity.getBizCode()); integrationTaskLivingDetailsEntity.setPluginId(getPluginId()); saveOrUpdateBusinessLogUtil.saveOrUpdate(integrationTaskLivingDetailsEntity);