Merge branch 'feature/pool381_fms_invice' into debug

controllers/statistic_report.go

@@ -6425,7 +6425,7 @@ func (this *StatisticReportController) InvoicePaymentList() {
 			return
 		}
 		for _, v := range shareSellerList {
-			name := fmt.Sprintf("%s_%s", v.CompanyName, v.ProductId)
+			name := fmt.Sprintf("%s_%d", v.CompanyName, v.ProductId)
 			shareSellerMap[name] = v
 		}
 	}
@@ -6594,6 +6594,7 @@ func (this *StatisticReportController) InvoicePaymentList() {
 				v.InvoicePaymentList = summaryMap[registerList[i].SummaryId]
 				v.ContractType = registerList[i].ContractType
 				v.ActualPayCompanies = registerList[i].ActualPayCompanies
+				v.ServiceProductId = registerList[i].ServiceProductId
 				shareSellerItem := fmt.Sprintf("%s_%d", registerList[i].CompanyName, v.ServiceProductId)
 				contractShareSeller, ok := shareSellerMap[shareSellerItem]
 				if ok {

models/fms/invoice_payment_summary.go

@@ -20,6 +20,7 @@ type InvoicePaymentSummary struct {
 type ContractRegisterSummary struct {
 	SummaryId int `json:"summary_id" description:"汇总ID"`
 	ContractRegister
+	ServiceProductId int `json:"service_product_id" description:"套餐类型：1ficc套餐，2权益套餐"`
 }
 
 // GetInvoicePaymentCensusPageList 获取商品到款统计列表-总数