diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.xml b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.xml index ec13d8ab..27d101f3 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.xml +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.xml @@ -859,7 +859,8 @@ businessDate = values(businessDate), successfulTradeDate = values(successfulTradeDate), businessType = values(businessType), - sourceOrderStatus = values(sourceOrderStatus) + sourceOrderStatus = values(sourceOrderStatus), + tradeSuccessAt = values(tradeSuccessAt) diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java index 6febb1f4..9130b950 100644 --- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java +++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToC.java @@ -819,7 +819,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { List tocofsSaleoutEntityList = copyHeaderDto(headerDtoList); if (tocofsSaleoutEntityList != null && tocofsSaleoutEntityList.size() > 0) { logger.info("TocofsSaleoutEntity:插入底表{}个对象(表头)", tocofsSaleoutEntityList.size()); - iTocofsSaleoutDao.entityInsertBatch(tocofsSaleoutEntityList); + iTocofsSaleoutDao.entityInsertOrUpdateBatch(tocofsSaleoutEntityList); } else { logger.info("TocofsSaleoutEntity:TOC业务没有对象被插入表头底表"); } @@ -850,7 +850,7 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity { List tocofsSaleoutDetailedEntities = copyDetailsDto(detailsDtos); if (tocofsSaleoutDetailedEntities.size() > 0) { logger.info("TocofsSaleoutDetailedEntity:插入底表{}个对象(表体)", tocofsSaleoutDetailedEntities.size()); - iTocofsSaleoutDetailedDao.entityInsertBatch(tocofsSaleoutDetailedEntities); + iTocofsSaleoutDetailedDao.entityInsertOrUpdateBatch(tocofsSaleoutDetailedEntities); } else { logger.info("TocofsSaleoutDetailedEntity:没有对象被插入表头底表"); } diff --git a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java index 60f9f1dd..e28400db 100644 --- a/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java +++ b/buildpackage/src/test/java/com/hzya/frame/plugin/lets/plugin/sales/SoSaleOutPluginInitializerToCTest.java @@ -120,7 +120,7 @@ class SoSaleOutPluginInitializerToCTest { // String aaa = "LETS-SH2024102800021196"; // soSaleOutPluginInitializerToC.startImplementStockByTime("2024-12-06 09:25:39", "2024-12-06 09:25:39"); - soSaleOutPluginInitializerToC.startImplementStockByTime("2024-11-02 17:09:02", "2024-11-02 17:09:02", "1"); + soSaleOutPluginInitializerToC.startImplementTranByTime("2024-12-24 14:59:58", "2024-12-24 14:59:58", "0"); } catch (Exception e) { e.printStackTrace(); }