fix

controller/census/invoice_payment.go

@@ -1592,7 +1592,7 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 					if v.ServiceProductId == 1 {
 						if serviceAmount, ok := serviceAmountMap[v.ContractRegisterId]; ok {
 							item := fms.NotInvoicePaymentSummaryItem{
-								NotInvoicedAmountTotal: serviceAmount[2].ServiceAmount,
+								NotInvoicedAmountOriginTotal: serviceAmount[2].ServiceAmount,
 								ServiceProductId:       2,
 							}
 							item.SellerId = v.SellerId
@@ -1605,7 +1605,7 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 					} else {
 						if serviceAmount, ok := serviceAmountMap[v.ContractRegisterId]; ok {
 							item := fms.NotInvoicePaymentSummaryItem{
-								NotInvoicedAmountTotal: serviceAmount[1].ServiceAmount,
+								NotInvoicedAmountOriginTotal: serviceAmount[1].ServiceAmount,
 								ServiceProductId:       1,
 							}
 							item.SellerId = v.SellerId
@@ -1621,7 +1621,7 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 					// 套餐是ficc权益都有的，但是都没进行过开票到款，补充两个套餐的内容，直接用合同金额当作未开票金额即可
 					if serviceAmount, ok := serviceAmountMap[v.ContractRegisterId]; ok {
 						item1 := fms.NotInvoicePaymentSummaryItem{
-							NotInvoicedAmountTotal: serviceAmount[2].ServiceAmount,
+							NotInvoicedAmountOriginTotal: serviceAmount[2].ServiceAmount,
 							ServiceProductId:       2,
 						}
 						item1.SellerId = v.SellerId
@@ -1631,7 +1631,7 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 						NotInvoiceSummaryMap[v.ContractRegisterId] = append(NotInvoiceSummaryMap[v.ContractRegisterId], &item1)
 
 						item2 := fms.NotInvoicePaymentSummaryItem{
-							NotInvoicedAmountTotal: serviceAmount[1].ServiceAmount,
+							NotInvoicedAmountOriginTotal: serviceAmount[1].ServiceAmount,
 							ServiceProductId:       1,
 						}
 						item2.SellerId = v.SellerId
@@ -1645,7 +1645,7 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 					// 只有ficc套餐，但是未进行过开票到款，手动补充信息
 					if serviceAmount, ok := serviceAmountMap[v.ContractRegisterId]; ok {
 						item1 := fms.NotInvoicePaymentSummaryItem{
-							NotInvoicedAmountTotal: serviceAmount[1].ServiceAmount,
+							NotInvoicedAmountOriginTotal: serviceAmount[1].ServiceAmount,
 							ServiceProductId:       1,
 						}
 						item1.SellerId = v.SellerId
@@ -1659,7 +1659,7 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 					// 只有权益套餐，但是未进行过开票到款，手动补充信息
 					if serviceAmount, ok := serviceAmountMap[v.ContractRegisterId]; ok {
 						item2 := fms.NotInvoicePaymentSummaryItem{
-							NotInvoicedAmountTotal: serviceAmount[2].ServiceAmount,
+							NotInvoicedAmountOriginTotal: serviceAmount[2].ServiceAmount,
 							ServiceProductId:       2,
 						}
 						item2.SellerId = v.SellerId
@@ -1703,28 +1703,29 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 					// fmt.Println("v.ServiceProductId:", v.ServiceProductId)
 					// fmt.Println("v.NotInvoicedAmountTotal:", v.NotInvoicedAmountTotal)
 					// fmt.Println("registerId:",registerId)
-					if v.NotInvoicedAmountTotal == 0 {
+					if v.NotInvoicedAmountOriginTotal == 0 {
 						if v.InvoiceAmountTotal > v.PaymentAmountTotal {
 							// 有合规登记或补录合同过的，有serviceAmountMap信息
 							if _, ok := serviceAmountMap[registerId]; ok {
 								if _, ok2 := serviceAmountMap[registerId][v.ServiceProductId]; ok2 {
-									v.NotInvoicedAmountTotal = serviceAmountMap[registerId][v.ServiceProductId].ServiceAmount - v.InvoiceAmountTotal
+									v.NotInvoicedAmountOriginTotal = serviceAmountMap[registerId][v.ServiceProductId].ServiceAmount - v.InvoiceAmountTotal
 								}
 							} else {
 								// 预登记没有合同套餐金额信息
-								v.NotInvoicedAmountTotal = v.InvoiceAmountTotal - v.PaymentAmountTotal
+								v.NotInvoicedAmountOriginTotal = v.InvoiceAmountTotal - v.PaymentAmountTotal
 							}
 						} else {
 							if _, ok := serviceAmountMap[registerId]; ok {
 								// 有合规登记或补录合同过的，有serviceAmountMap信息
 								if _, ok2 := serviceAmountMap[registerId][v.ServiceProductId]; ok2 {
-									v.NotInvoicedAmountTotal = serviceAmountMap[registerId][v.ServiceProductId].ServiceAmount - v.PaymentAmountTotal
+									v.NotInvoicedAmountOriginTotal = serviceAmountMap[registerId][v.ServiceProductId].ServiceAmount - v.PaymentAmountTotal
 								}
 							} else {
 								// 预登记没有合同套餐金额信息
-								v.NotInvoicedAmountTotal = v.PaymentAmountTotal - v.InvoiceAmountTotal
+								v.NotInvoicedAmountOriginTotal = v.PaymentAmountTotal - v.InvoiceAmountTotal
 							}
 						}
+						v.NotInvoicedAmountTotal = v.NotInvoicedAmountOriginTotal/v.RMBRate
 					}
 					// 补充销售信息
 					if v.SellerId > 0 && v.RaiSellerId > 0 {

models/fms/invoice_payment_summary.go

@@ -306,31 +306,32 @@ func (c IncomeSummaryItemList) Swap(i, j int) {
 }
 
 type NotInvoicePaymentSummaryItem struct {
-	SummaryId              int       `json:"summary_id" description:"汇总ID"`
-	RegisterId             int       `json:"register_id" description:"登记ID"`
-	NewCompany             int       `json:"new_company" description:"是否为新客户: 0-否; 1-是"`
-	InvoiceId              int       `json:"invoice_id" description:"开票ID"`
-	InvoiceDate            time.Time `json:"invoice_time" description:"开票日期"`
-	InvoiceAmount          float64   `json:"invoice_amount" description:"开票金额"`
-	InvoiceOriginAmount    float64   `json:"invoice_origin_amount" description:"开票原始金额"`
-	SellerGroupId          int       `json:"seller_group_id" description:"销售组别ID"`
-	SellerGroupName        string    `json:"seller_group_name" description:"销售组别名称"`
-	RaiSellerGroupId       int       `json:"rai_seller_group_id" description:"销售组别ID"`
-	RaiSellerGroupName     string    `json:"rai_seller_group_name" description:"销售组别名称"`
-	PaymentId              int       `json:"payment_id" description:"到款ID"`
-	PaymentDate            time.Time `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-异常"`
-	ServiceProductId       int       `json:"service_product_id" description:"套餐类型：1ficc套餐，2权益套餐"`
-	ContractAmount         float64   `gorm:"column:contract_amount" json:"contract_amount" description:"合同金额"`
-	InvoicedAmount         float64   `gorm:"column:invoiced_amount" json:"invoiced_amount" description:"开票金额"`
-	CurrencyUnit           string    `gorm:"column:currency_unit" json:"currency_unit" description:"货币国际代码"`
-	RMBRate                float64   `gorm:"column:rmb_rate" json:"rmb_rate" description:"人民币汇率(create_time当日)"`
-	PaymentAmountTotal     float64   `gorm:"column:payment_amount_total" json:"payment_amount_total" description:"合同金额"`
-	InvoiceAmountTotal     float64   `gorm:"column:invoice_amount_total" json:"invoice_amount_total" description:"开票金额"`
-	NotInvoicedAmountTotal float64   ` json:"not_invoiced_amount_total" description:"未开票金额"`
-	SellerType             string    `json:"seller_type" description:"销售类型"`
+	SummaryId                    int       `json:"summary_id" description:"汇总ID"`
+	RegisterId                   int       `json:"register_id" description:"登记ID"`
+	NewCompany                   int       `json:"new_company" description:"是否为新客户: 0-否; 1-是"`
+	InvoiceId                    int       `json:"invoice_id" description:"开票ID"`
+	InvoiceDate                  time.Time `json:"invoice_time" description:"开票日期"`
+	InvoiceAmount                float64   `json:"invoice_amount" description:"开票金额"`
+	InvoiceOriginAmount          float64   `json:"invoice_origin_amount" description:"开票原始金额"`
+	SellerGroupId                int       `json:"seller_group_id" description:"销售组别ID"`
+	SellerGroupName              string    `json:"seller_group_name" description:"销售组别名称"`
+	RaiSellerGroupId             int       `json:"rai_seller_group_id" description:"销售组别ID"`
+	RaiSellerGroupName           string    `json:"rai_seller_group_name" description:"销售组别名称"`
+	PaymentId                    int       `json:"payment_id" description:"到款ID"`
+	PaymentDate                  time.Time `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-异常"`
+	ServiceProductId             int       `json:"service_product_id" description:"套餐类型：1ficc套餐，2权益套餐"`
+	ContractAmount               float64   `gorm:"column:contract_amount" json:"contract_amount" description:"合同金额"`
+	InvoicedAmount               float64   `gorm:"column:invoiced_amount" json:"invoiced_amount" description:"开票金额"`
+	CurrencyUnit                 string    `gorm:"column:currency_unit" json:"currency_unit" description:"货币国际代码"`
+	RMBRate                      float64   `gorm:"column:rmb_rate" json:"rmb_rate" description:"人民币汇率(create_time当日)"`
+	PaymentAmountTotal           float64   `gorm:"column:payment_amount_total" json:"payment_amount_total" description:"合同金额"`
+	InvoiceAmountTotal           float64   `gorm:"column:invoice_amount_total" json:"invoice_amount_total" description:"开票金额"`
+	NotInvoicedAmountOriginTotal float64   ` json:"not_invoiced_amount_origin_total" description:"未开票金额"`
+	NotInvoicedAmountTotal       float64   ` json:"not_invoiced_amount_total" description:"未开票转换金额"`
+	SellerType                   string    `json:"seller_type" description:"销售类型"`
 	ContractRegister
 }