From 472964e254b461ce59b4eb4c37c44dcfe2302174 Mon Sep 17 00:00:00 2001
From: liuy <37787198+LiuyCodes@users.noreply.github.com>
Date: Thu, 28 Nov 2024 11:16:01 +0800
Subject: [PATCH] =?UTF-8?q?feat(report):=20=E6=B7=BB=E5=8A=A0=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E5=BA=94=E6=94=B6=E5=92=8C=E8=AE=A1=E7=AE=97=E5=85=AC?=
 =?UTF-8?q?=E5=BC=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 TOBOFSReturnGoodsDetailedDto、TOBOFSaleoutDetailedDto 和 TOCOFSReturnGoodsDetailedDto 中添加计算应收和计算公式字段
- 在 TOCOFSReturnGoodsDetailedDto 中添加平台优惠、支付优惠、达人优惠和商家优惠字段
- 更新数据库实体 XML 文件，添加对应字段的映射
---
 .../dto/TobofsReturnGoodsDetailedDto.java     |  8 +++++++-
 .../lets/dto/TobofsSaleoutDetailedDto.java    |  5 ++++-
 .../dto/TocofsReturnGoodsDetailedDto.java     | 20 +++++++++++++++++++
 .../TocofsReturngoodsDetailedEntity.xml       | 10 ++++++++++
 .../entity/TocofsSaleoutDetailedEntity.xml    |  1 +
 5 files changed, 42 insertions(+), 2 deletions(-)

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 @@
         <result property="newState4" column="newState4" jdbcType="VARCHAR"/>
         <result property="newSystemNumber4" column="newSystemNumber4" jdbcType="VARCHAR"/>
         <result property="newSystemPrimary4" column="newSystemPrimary4" jdbcType="VARCHAR"/>
+
+        <result property="def7" column="def7" jdbcType="VARCHAR"/>
+        <result property="def8" column="def8" jdbcType="VARCHAR"/>
+        <result property="def9" column="def9" jdbcType="VARCHAR"/>
+        <result property="def10" column="def10" jdbcType="VARCHAR"/>
+        <result property="def11" column="def11" jdbcType="VARCHAR"/>
+        <result property="def12" column="def12" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!-- 查询 采用==查询，适用toc -->
@@ -730,6 +737,9 @@
         <result property="newState2" column="newState2" jdbcType="VARCHAR"/>
         <result property="newSystemNumber2" column="newSystemNumber2" jdbcType="VARCHAR"/>
         <result property="newSystemPrimary2" column="newSystemPrimary2" jdbcType="VARCHAR"/>
+
+        <result property="def7" column="def7" jdbcType="VARCHAR"/>
+        <result property="def8" column="def8" jdbcType="VARCHAR"/>
     </resultMap>
 
 
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 @@
         <result property="successfulTradeDate" column="successfulTradeDate" jdbcType="VARCHAR"/>
 
         <result property="def7" column="def7" jdbcType="VARCHAR"/>
+        <result property="def8" column="def8" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!-- TOC通用查询 采用==查询 -->