Merge branch '6/6_fix' into debug

controller/census/invoice_payment.go

@@ -1687,7 +1687,7 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 				resp.FailMsg("获取失败", "获取商品到款汇总列表失败, Err: "+e.Error(), c)
 				return
 			}
-			fmt.Println("len(summaryData)", len(summaryData))
+			//fmt.Println("len(summaryData)", len(summaryData))
 
 			// 有过开票到款记录的合同ids，在后面的查询中去除
 			notQueryRegisterIds := make([]int, 0)
@@ -1700,7 +1700,7 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 			// 有开票到款过的记录map，用于在后面判断是否有过开票到款，然后补充数据
 			NotInvoiceSummaryMap := make(map[int][]*fms.NotInvoicePaymentSummaryItem, 0)
 			for _, v := range summaryList {
-				fmt.Println("v2.ContractRegisterId", v.ContractRegisterId)
+				//fmt.Println("v2.ContractRegisterId", v.ContractRegisterId)
 				NotInvoiceSummaryMap[v.RegisterId] = append(NotInvoiceSummaryMap[v.RegisterId], v)
 			}
 
@@ -1718,7 +1718,7 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 				resp.FailMsg("获取失败", "GetNoInvoicePaymentCensusData, Err: "+e.Error(), c)
 				return
 			}
-			fmt.Println("len(noSummaryData)", len(noSummaryData))
+			//fmt.Println("len(noSummaryData)", len(noSummaryData))
 
 			//补充为完整的list，包含有汇总记录的和没有汇总记录的
 			summaryList = append(summaryList, noSummaryData...)
@@ -1845,9 +1845,9 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 
 			for registerId, list := range NotInvoiceSummaryMap {
 				for _, v := range list {
-					fmt.Println("v.ContractRegisterId", v.ContractRegisterId)
-					fmt.Println("v.ServiceProductId:", v.ServiceProductId)
-					fmt.Println("v.NotInvoicedAmountTotal:", v.NotInvoicedAmountTotal)
+					//fmt.Println("v.ContractRegisterId", v.ContractRegisterId)
+					//fmt.Println("v.ServiceProductId:", v.ServiceProductId)
+					//fmt.Println("v.NotInvoicedAmountTotal:", v.NotInvoicedAmountTotal)
 					if v.NotInvoicedAmountTotal == 0 {
 						if v.InvoiceAmountTotal > v.PaymentAmountTotal {
 							v.NotInvoicedAmountTotal = serviceAmountMap[registerId][v.ServiceProductId].ServiceAmount - v.InvoiceAmountTotal
@@ -1936,7 +1936,7 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 				}
 				if _, ok := contractIdSumMap[v.ContractRegisterId]; !ok {
 					contractIdSumMap[v.ContractRegisterId] = 1
-					contractAmount += v.ContractAmount / v.RMBRate
+					contractAmount += v.ContractAmount / rate
 				}
 			}
 
@@ -2029,6 +2029,9 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 		results.InvoiceCurrencyTotal = invoiceCurrencyTotals
 		results.PaymentCurrencyTotal = paymentCurrencyTotals
 		results.NotInvoiceCurrencyTotal = contractAmountCurrencyTotals
+		fmt.Println("NotInvoiceTotal:", contractAmount-invoiceTotal)
+		fmt.Println("contractAmount:", contractAmount)
+		fmt.Println("invoiceTotal:", invoiceTotal)
 	}
 
 	// 是否导出