fix

controller/census/invoice_payment.go

@@ -529,6 +529,7 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 				v.InvoiceId = summaryList[i].InvoiceId
 				v.InvoiceDate = utils.TimeTransferString(utils.FormatDate, summaryList[i].InvoiceDate)
 				v.InvoiceAmount = summaryList[i].InvoiceAmount
+				v.InvoiceOriginAmount = summaryList[i].InvoiceOriginAmount
 				v.SellerId = summaryList[i].SellerId
 				v.SellerName = summaryList[i].SellerName
 				v.SellerGroupId = summaryList[i].SellerGroupId
@@ -539,6 +540,7 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 				v.PaymentId = summaryList[i].PaymentId
 				v.PaymentDate = utils.TimeTransferString(utils.FormatDate, summaryList[i].PaymentDate)
 				v.PaymentAmount = summaryList[i].PaymentAmount
+				v.PaymentOriginAmount = summaryList[i].PaymentOriginAmount
 				v.PayType = summaryList[i].PayType
 				// 套餐到款分配
 				svaList := make([]*fms.ContractPaymentServiceAmountItem, 0)
@@ -2103,6 +2105,7 @@ func (ct *InvoicePaymentController) NotPaymentList(c *gin.Context) {
 				v.InvoiceId = summaryList[i].InvoiceId
 				v.InvoiceDate = utils.TimeTransferString(utils.FormatDate, summaryList[i].InvoiceDate)
 				v.InvoiceAmount = summaryList[i].InvoiceAmount
+				v.InvoiceOriginAmount = summaryList[i].InvoiceOriginAmount
 				v.SellerId = summaryList[i].SellerId
 				v.SellerName = summaryList[i].SellerName
 				v.SellerGroupId = summaryList[i].SellerGroupId
@@ -2114,6 +2117,7 @@ func (ct *InvoicePaymentController) NotPaymentList(c *gin.Context) {
 				v.PaymentId = summaryList[i].PaymentId
 				v.PaymentDate = utils.TimeTransferString(utils.FormatDate, summaryList[i].PaymentDate)
 				v.PaymentAmount = summaryList[i].PaymentAmount
+				v.PaymentOriginAmount = summaryList[i].PaymentOriginAmount
 				v.PayType = summaryList[i].PayType
 				v.NotPaymentAmount = summaryList[i].InvoiceAmount - summaryList[i].PaymentAmount
 				v.ServiceProductId = summaryList[i].ServiceProductId

models/fms/contract_invoice.go

@@ -357,19 +357,21 @@ type InvoicePaymentCensusItem struct {
 
 // InvoicePaymentCensusInfo 开票到款统计信息
 type InvoicePaymentCensusInfo struct {
-	InvoiceId         int                                 `json:"invoice_id" description:"开票ID"`
-	InvoiceDate       string                              `json:"invoice_time" description:"开票日期"`
-	InvoiceAmount     float64                             `json:"invoice_amount" description:"开票金额"`
-	SellerId          int                                 `json:"seller_id" description:"销售ID"`
-	SellerName        string                              `json:"seller_name" description:"销售名称"`
-	SellerGroupId     int                                 `json:"seller_group_id" description:"销售组别ID"`
-	SellerGroupName   string                              `json:"seller_group_name" description:"销售组别名称"`
-	PaymentId         int                                 `json:"payment_id" description:"到款ID"`
-	PaymentDate       string                              `json:"payment_date" description:"到款日期"`
-	PaymentAmount     float64                             `json:"payment_amount" description:"到款金额"`
-	PayType           int                                 `json:"pay_type" description:"付款方式：0-无；1-年付；2-半年付；3-季付；4-次付；5-异常"`
-	ServiceAmountList []*ContractPaymentServiceAmountItem `json:"service_amount_list" description:"到款套餐金额分配信息"`
-	SellerType        string                              `json:"seller_type" description:"销售类型：1ficc销售，2权益销售"`
+	InvoiceId           int                                 `json:"invoice_id" description:"开票ID"`
+	InvoiceDate         string                              `json:"invoice_time" description:"开票日期"`
+	InvoiceAmount       float64                             `json:"invoice_amount" description:"开票换算金额"`
+	InvoiceOriginAmount float64                             `json:"invoice_origin_amount" description:"开票原始金额"`
+	SellerId            int                                 `json:"seller_id" description:"销售ID"`
+	SellerName          string                              `json:"seller_name" description:"销售名称"`
+	SellerGroupId       int                                 `json:"seller_group_id" description:"销售组别ID"`
+	SellerGroupName     string                              `json:"seller_group_name" description:"销售组别名称"`
+	PaymentId           int                                 `json:"payment_id" description:"到款ID"`
+	PaymentDate         string                              `json:"payment_date" description:"到款日期"`
+	PaymentAmount       float64                             `json:"payment_amount" description:"到款换算金额"`
+	PaymentOriginAmount float64                             `json:"payment_origin_amount" description:"到款原始金额"`
+	PayType             int                                 `json:"pay_type" description:"付款方式：0-无；1-年付；2-半年付；3-季付；4-次付；5-异常"`
+	ServiceAmountList   []*ContractPaymentServiceAmountItem `json:"service_amount_list" description:"到款套餐金额分配信息"`
+	SellerType          string                              `json:"seller_type" description:"销售类型：1ficc销售，2权益销售"`
 }
 
 // ContractInvoiceAmountTotal 开票到款金额合计信息
@@ -709,22 +711,24 @@ type NotPaymentCensusItem struct {
 
 // NotPaymentCensusInfo 开票到款统计信息
 type NotPaymentCensusInfo struct {
-	InvoiceId         int                                 `json:"invoice_id" description:"开票ID"`
-	InvoiceDate       string                              `json:"invoice_time" description:"开票日期"`
-	InvoiceAmount     float64                             `json:"invoice_amount" description:"开票金额"`
-	SellerId          int                                 `json:"seller_id" description:"销售ID"`
-	SellerName        string                              `json:"seller_name" description:"销售名称"`
-	SellerGroupId     int                                 `json:"seller_group_id" description:"销售组别ID"`
-	SellerGroupName   string                              `json:"seller_group_name" description:"销售组别名称"`
-	PaymentId         int                                 `json:"payment_id" description:"到款ID"`
-	PaymentDate       string                              `json:"payment_date" description:"到款日期"`
-	PaymentAmount     float64                             `json:"payment_amount" description:"到款金额"`
-	PayType           int                                 `json:"pay_type" description:"付款方式：0-无；1-年付；2-半年付；3-季付；4-次付；5-异常"`
-	ServiceAmountList []*ContractPaymentServiceAmountItem `json:"service_amount_list" description:"到款套餐金额分配信息"`
-	SellerType        int                                 `json:"seller_type" description:"销售类型：1ficc销售，2权益销售"`
-	NotPaymentAmount  float64                             `json:"not_payment_amount" description:"开票未到款金额"`
-	ServiceProductId  int                                 `json:"service_product_id" description:"套餐类型：1ficc套餐，2权益套餐"`
-	UnitName          string                              `json:"unit_name" description:"单位名称"`
+	InvoiceId           int                                 `json:"invoice_id" description:"开票ID"`
+	InvoiceDate         string                              `json:"invoice_time" description:"开票日期"`
+	InvoiceAmount       float64                             `json:"invoice_amount" description:"开票换算金额"`
+	InvoiceOriginAmount float64                             `json:"invoice_origin_amount" description:"开票原始金额"`
+	SellerId            int                                 `json:"seller_id" description:"销售ID"`
+	SellerName          string                              `json:"seller_name" description:"销售名称"`
+	SellerGroupId       int                                 `json:"seller_group_id" description:"销售组别ID"`
+	SellerGroupName     string                              `json:"seller_group_name" description:"销售组别名称"`
+	PaymentId           int                                 `json:"payment_id" description:"到款ID"`
+	PaymentDate         string                              `json:"payment_date" description:"到款日期"`
+	PaymentAmount       float64                             `json:"payment_amount" description:"到款换算金额"`
+	PaymentOriginAmount float64                             `json:"payment_origin_amount" description:"到款原始金额"`
+	PayType             int                                 `json:"pay_type" description:"付款方式：0-无；1-年付；2-半年付；3-季付；4-次付；5-异常"`
+	ServiceAmountList   []*ContractPaymentServiceAmountItem `json:"service_amount_list" description:"到款套餐金额分配信息"`
+	SellerType          int                                 `json:"seller_type" description:"销售类型：1ficc销售，2权益销售"`
+	NotPaymentAmount    float64                             `json:"not_payment_amount" description:"开票未到款金额"`
+	ServiceProductId    int                                 `json:"service_product_id" description:"套餐类型：1ficc套餐，2权益套餐"`
+	UnitName            string                              `json:"unit_name" description:"单位名称"`
 }
 
 // GetCensusSellerGroupInvoicePageListV2 获取销售组开票统计列表-分页