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 @@
+