From f81ae5e362a54c051b129ea358ea8213af9d9cb6 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Tue, 19 Aug 2025 10:07:14 +0800 Subject: [PATCH] =?UTF-8?q?feat(report):=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=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 OfsPassiveorderDetailDto、OnlyAfterSalesBDto 和 TocofsReturnGoodsDetailedDto 中添加交易成功时间字段 - 在 OfsPassiveorderDetailEntity、OnlyAfterSalesBEntity 和 TocofsReturngoodsDetailedEntity 中添加对应的实体属性 - 更新 XML 文件以包含新字段的映射 --- .../report/lets/dto/OfsPassiveorderDetailDto.java | 11 +++++++++++ .../frame/report/lets/dto/OnlyAfterSalesBDto.java | 3 +++ .../report/lets/dto/TocofsReturnGoodsDetailedDto.java | 3 +++ .../lets/entity/OfsPassiveorderDetailEntity.java | 10 ++++++++++ .../lets/entity/OfsPassiveorderDetailEntity.xml | 7 +++++++ .../report/lets/entity/OnlyAfterSalesBEntity.xml | 8 ++++++++ .../lets/entity/TocofsReturngoodsDetailedEntity.xml | 1 + 7 files changed, 43 insertions(+) diff --git a/service/src/main/java/com/hzya/frame/report/lets/dto/OfsPassiveorderDetailDto.java b/service/src/main/java/com/hzya/frame/report/lets/dto/OfsPassiveorderDetailDto.java index 64345e06..b6ab39ba 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/dto/OfsPassiveorderDetailDto.java +++ b/service/src/main/java/com/hzya/frame/report/lets/dto/OfsPassiveorderDetailDto.java @@ -65,6 +65,9 @@ public class OfsPassiveorderDetailDto { @ExcelProperty(value = "入库推送状态") private String newstate; + @ExcelProperty(value = "交易成功时间") + private String def11; + @ExcelProperty(value = "U销售订单编码") private String newsystemnumber; @@ -95,6 +98,14 @@ public class OfsPassiveorderDetailDto { @ExcelProperty(value = "O商家优惠") private String def6; + public String getDef11() { + return def11; + } + + public void setDef11(String def11) { + this.def11 = def11; + } + public String getReceiptCode() { return receiptCode; } diff --git a/service/src/main/java/com/hzya/frame/report/lets/dto/OnlyAfterSalesBDto.java b/service/src/main/java/com/hzya/frame/report/lets/dto/OnlyAfterSalesBDto.java index 7472b492..c122f1b7 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/dto/OnlyAfterSalesBDto.java +++ b/service/src/main/java/com/hzya/frame/report/lets/dto/OnlyAfterSalesBDto.java @@ -111,6 +111,9 @@ public class OnlyAfterSalesBDto { @ExcelProperty(value = "情况类型") private String def7; + @ExcelProperty(value = "交易成功时间") + private String def13; + @ExcelProperty(value = "O计算应收") private String def1; diff --git a/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsReturnGoodsDetailedDto.java b/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsReturnGoodsDetailedDto.java index fb94d5c4..a24b09a4 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsReturnGoodsDetailedDto.java +++ b/service/src/main/java/com/hzya/frame/report/lets/dto/TocofsReturnGoodsDetailedDto.java @@ -77,6 +77,9 @@ public class TocofsReturnGoodsDetailedDto { @ExcelProperty(value = "交易成功蓝-下游主键") private String def17; + //交易成功时间 + private String def23; + //情况类型 @ExcelProperty(value = "情况类型") private String def24; diff --git a/service/src/main/java/com/hzya/frame/report/lets/entity/OfsPassiveorderDetailEntity.java b/service/src/main/java/com/hzya/frame/report/lets/entity/OfsPassiveorderDetailEntity.java index 66350ef6..bd3003b6 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/entity/OfsPassiveorderDetailEntity.java +++ b/service/src/main/java/com/hzya/frame/report/lets/entity/OfsPassiveorderDetailEntity.java @@ -127,6 +127,8 @@ public class OfsPassiveorderDetailEntity extends BaseEntity { private String def10; + private String def11; + private String businessDateStart; private String businessDateEnd; @@ -482,5 +484,13 @@ public class OfsPassiveorderDetailEntity extends BaseEntity { public void setTransactionDate(String transactionDate) { this.transactionDate = transactionDate; } + + public String getDef11() { + return def11; + } + + public void setDef11(String def11) { + this.def11 = def11; + } } diff --git a/service/src/main/java/com/hzya/frame/report/lets/entity/OfsPassiveorderDetailEntity.xml b/service/src/main/java/com/hzya/frame/report/lets/entity/OfsPassiveorderDetailEntity.xml index bb9b2eeb..9a0ab23c 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/entity/OfsPassiveorderDetailEntity.xml +++ b/service/src/main/java/com/hzya/frame/report/lets/entity/OfsPassiveorderDetailEntity.xml @@ -67,6 +67,8 @@ + + @@ -193,6 +195,11 @@ ,a.def4 ,a.def5 ,a.def6 + ,a.def7 + ,a.def8 + ,a.def9 + ,a.def10 + ,a.def11 ,b.companyCode ,b.facilityCode ,b.storeCode diff --git a/service/src/main/java/com/hzya/frame/report/lets/entity/OnlyAfterSalesBEntity.xml b/service/src/main/java/com/hzya/frame/report/lets/entity/OnlyAfterSalesBEntity.xml index f5c3b5f0..a89ccf1d 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/entity/OnlyAfterSalesBEntity.xml +++ b/service/src/main/java/com/hzya/frame/report/lets/entity/OnlyAfterSalesBEntity.xml @@ -76,6 +76,13 @@ + + + + + + + @@ -133,6 +140,7 @@ ,def10 ,def11 ,def12 + ,def13 diff --git a/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsReturngoodsDetailedEntity.xml b/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsReturngoodsDetailedEntity.xml index a87635e0..c4025456 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsReturngoodsDetailedEntity.xml +++ b/service/src/main/java/com/hzya/frame/report/lets/entity/TocofsReturngoodsDetailedEntity.xml @@ -480,6 +480,7 @@ +