未开票逻辑修改

controller/census/invoice_payment.go

@@ -1851,9 +1851,21 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 					//fmt.Println("registerId:",registerId)
 					if v.NotInvoicedAmountTotal == 0 {
 						if v.InvoiceAmountTotal > v.PaymentAmountTotal {
-							v.NotInvoicedAmountTotal = serviceAmountMap[registerId][v.ServiceProductId].ServiceAmount - v.InvoiceAmountTotal
+							// 有合规登记或补录合同过的，有serviceAmountMap信息
+							if _,ok := serviceAmountMap[registerId]; ok {
+								v.NotInvoicedAmountTotal = serviceAmountMap[registerId][v.ServiceProductId].ServiceAmount - v.InvoiceAmountTotal
+							} else {
+								// 预登记没有合同套餐金额信息
+								v.NotInvoicedAmountTotal = v.InvoiceAmountTotal - v.PaymentAmountTotal
+							}
 						} else {
-							v.NotInvoicedAmountTotal = serviceAmountMap[registerId][v.ServiceProductId].ServiceAmount - v.PaymentAmountTotal
+							if _,ok := serviceAmountMap[registerId]; ok {
+								// 有合规登记或补录合同过的，有serviceAmountMap信息
+								v.NotInvoicedAmountTotal = serviceAmountMap[registerId][v.ServiceProductId].ServiceAmount - v.PaymentAmountTotal
+							} else {
+								// 预登记没有合同套餐金额信息
+								v.NotInvoicedAmountTotal = v.PaymentAmountTotal - v.InvoiceAmountTotal
+							}
 						}
 					}
 					// 补充销售信息