From 660ca7f95241c25a91f3a9f39495d02bfbae7c8f Mon Sep 17 00:00:00 2001
From: liuy <37787198+LiuyCodes@users.noreply.github.com>
Date: Thu, 16 Jan 2025 13:59:18 +0800
Subject: [PATCH] =?UTF-8?q?feat(sales):=20=E6=B7=BB=E5=8A=A0=E4=BA=A4?=
=?UTF-8?q?=E6=98=93=E6=88=90=E5=8A=9F=E6=97=B6=E9=97=B4=E7=AD=9B=E9=80=89?=
=?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在 TocofsSaleoutDetailedEntity 中添加 tradeSuccessAt_start 和 tradeSuccessAt_end 字段
- 更新 XML 文件以支持新的交易成功时间筛选条件
- 修改 SoSaleOutPluginInitializerToC 中的查询逻辑
- 更新 TobofsSaleoutDetailedDto 和服务层 XML 文件中的字段名称
---
.../ofs/entity/TocofsSaleoutDetailedEntity.java | 9 +++++++++
.../ofs/entity/TocofsSaleoutDetailedEntity.xml | 3 +++
.../sales/SoSaleOutPluginInitializerToC.java | 8 ++++----
.../report/lets/dto/TobofsSaleoutDetailedDto.java | 4 +++-
.../lets/entity/TocofsSaleoutDetailedEntity.xml | 14 ++++++++------
5 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.java
index 15d58981..456cc70b 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/ofs/entity/TocofsSaleoutDetailedEntity.java
@@ -392,4 +392,13 @@ public class TocofsSaleoutDetailedEntity extends BaseEntity {
*/
private String tradesuccessat;
+ /**
+ * 明细行交易成功时间开始
+ */
+ private String tradeSuccessAt_start;
+
+ /**
+ * 明细行交易成功时间结束
+ */
+ private String tradeSuccessAt_end;
}
\ No newline at end of file
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 f5eee2ef..b72ae001 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
@@ -293,6 +293,9 @@
and businessDate <= #{businessDateEnd}
and successfulTradeDate >= #{successfultradedateStart}
and successfulTradeDate <= #{successfultradedateEnd}
+
+ and tradeSuccessAt >= #{tradeSuccessAt_start}
+ and tradeSuccessAt <= #{tradeSuccessAt_end}
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 da6dc4a8..c6cc1e85 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
@@ -459,14 +459,14 @@ public class SoSaleOutPluginInitializerToC extends PluginBaseEntity {
//1:中台->u8c
TocofsSaleoutDetailedEntity tocofsSaleoutDetailedEntity = new TocofsSaleoutDetailedEntity();
if (startTime.length() == 19) {
- tocofsSaleoutDetailedEntity.setSuccessfultradedateStart(startTime);
+ tocofsSaleoutDetailedEntity.setTradeSuccessAt_start(startTime);
} else {
- tocofsSaleoutDetailedEntity.setSuccessfultradedateStart(startTime + " 00:00:00");
+ tocofsSaleoutDetailedEntity.setTradeSuccessAt_end(startTime + " 00:00:00");
}
if (endTime.length() == 19) {
- tocofsSaleoutDetailedEntity.setSuccessfultradedateEnd(endTime);
+ tocofsSaleoutDetailedEntity.setTradeSuccessAt_start(endTime);
} else {
- tocofsSaleoutDetailedEntity.setSuccessfultradedateEnd(endTime + " 23:59:59");
+ tocofsSaleoutDetailedEntity.setTradeSuccessAt_end(endTime + " 23:59:59");
}
tocofsSaleoutDetailedEntity.setBusinesstype("TOC_ORDER");
headerDetailsDtoList = queryTocOfsSaleoutDetailed(tocofsSaleoutDetailedEntity);
diff --git a/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java b/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java
index 0dd233f2..c6b35733 100644
--- a/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java
+++ b/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsSaleoutDetailedDto.java
@@ -67,8 +67,10 @@ public class TobofsSaleoutDetailedDto {
//库存 结束
//TOB交易红 开始
+// @ExcelProperty(value = "交易-O交易成功时间")
+// private String successfulTradeDate;
@ExcelProperty(value = "交易-O交易成功时间")
- private String successfulTradeDate;
+ private String tradeSuccessAt;
@ExcelProperty(value = "交易-推送状态")
private String newstate4;
diff --git a/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml b/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml
index 060efa64..a95af29f 100644
--- a/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml
+++ b/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsSaleoutDetailedEntity.xml
@@ -398,10 +398,10 @@
and a.businessDate <= #{businessdate_end}
- and a.successfulTradeDate >= #{successfultradedate_start}
+ and a.tradeSuccessAt >= #{successfultradedate_start}
- and a.successfulTradeDate <= #{successfultradedate_end}
+ and a.tradeSuccessAt <= #{successfultradedate_end}
and b.code = #{headCode}
@@ -474,6 +474,7 @@
+
@@ -749,6 +750,7 @@
,a.newSystemPrimary4
,a.businessDate
,a.successfulTradeDate
+ ,a.tradeSuccessAt
,a.businessType
,a.def1
,a.def2
@@ -903,10 +905,10 @@
and a.businessDate <= #{businessdate_end}
- and a.successfulTradeDate >= #{successfultradedate_start}
+ and a.tradeSuccessAt >= #{successfultradedate_start}
- and a.successfulTradeDate <= #{successfultradedate_end}
+ and a.tradeSuccessAt <= #{successfultradedate_end}
and b.code = #{headCode}
@@ -1126,10 +1128,10 @@
and businessDate <= #{businessdate_end}
- and successfulTradeDate >= #{successfultradedate_start}
+ and tradeSuccessAt >= #{successfultradedate_start}
- and successfultradedate_end <= #{successfultradedate_end}
+ and tradeSuccessAt <= #{successfultradedate_end}
-- and sts='Y'