diff --git a/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsReturnGoodsDetailedDto.java b/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsReturnGoodsDetailedDto.java index 21580b5c..cb4a4a3b 100644 --- a/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsReturnGoodsDetailedDto.java +++ b/service/src/main/java/com/hzya/frame/report/lets/dto/TobofsReturnGoodsDetailedDto.java @@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; /** - * TOC退货Excel报表导出 + * TOB退货Excel报表导出 * * @Author:liuyang * @Package:com.hzya.frame.report.lets.dto @@ -66,4 +66,10 @@ public class TobofsReturnGoodsDetailedDto { @ExcelProperty(value = "交易成功-下游主键") private String newSystemPrimary2; //TOC退货-交易成功 结束 + + @ExcelProperty(value = "计算应收") + private String def7; + + @ExcelProperty(value = "计算公式") + private String def8; } 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 f06dcbf0..0dd233f2 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 @@ -85,9 +85,12 @@ public class TobofsSaleoutDetailedDto { @ExcelProperty(value = "交易-U8C主键") private String newsystemprimary4; //TOB交易红 结束 - + //应收 开始 @ExcelProperty(value = "计算应收") private String def7; + + @ExcelProperty(value = "计算公式") + private String def8; //应收 结束 } \ No newline at end of file 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 419466a4..4b439a2f 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 @@ -66,4 +66,24 @@ public class TocofsReturnGoodsDetailedDto { @ExcelProperty(value = "交易成功-下游主键") private String newSystemPrimary4; //TOC退货-交易成功 结束 + + //应收 开始 + @ExcelProperty(value = "计算应收") + private String def7; + + @ExcelProperty(value = "计算公式") + private String def8; + + @ExcelProperty(value = "平台优惠") + private String def9; + + @ExcelProperty(value = "支付优惠") + private String def10; + + @ExcelProperty(value = "达人优惠") + private String def11; + + @ExcelProperty(value = "商家优惠") + private String def12; + //应收 结束 } 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 ea618d42..a66257ba 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 @@ -466,6 +466,13 @@ + + + + + + + @@ -730,6 +737,9 @@ + + + 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 2eca4ace..c89450f8 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 @@ -475,6 +475,7 @@ +