Merge branch 'fms_3.0' into debug

controller/census/invoice_payment.go

@@ -1814,7 +1814,7 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 				if v.InvoicedAmount >= v.PaymentAmount {
 					invoiceTotal += v.InvoicedAmount
 				} else if v.InvoicedAmount == 0 {
-					invoiceTotal += v.PaymentOrigin
+					invoiceTotal += v.PaymentAmount
 				}
 				rate := v.RMBRate
 				if rate == 0.0 {
@@ -2469,7 +2469,9 @@ func ExportNotInvoiceCensusList(c *gin.Context, results *fms.NotInvoicePaymentCe
 						dataRow.AddCell().SetString(item.SellerType)         // 销售类型
 					}
 				} else if item.SellerId > 0 && item.RaiSellerId == 0 {
-					item.SellerGroupName = sellerMap[item.SellerId].GroupName
+					if seller, ok := sellerMap[item.SellerId]; ok {
+						item.SellerGroupName = seller.GroupName
+					}
 					if seller, ok := sellerMap[item.SellerId]; ok {
 						item.SellerType = sellerTypeMap[seller.DepartmentId]
 					}