Merge branch 'pool_447'

controller/census/invoice_payment.go

@@ -784,6 +784,7 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 						vv.ServiceTemplateId = svList[ii].ServiceTemplateId
 						vv.ServiceTemplateName = svList[ii].FormatTitle
 						vv.ServiceTemplatePid = svList[ii].ServiceTemplatePid
+						vv.ServiceProductId = svList[ii].ServiceProductId
 						k2 := fmt.Sprintf("%d-%d", summaryList[i].PaymentId, svList[ii].ServiceTemplateId)
 						a := amountMap[k2]
 						if a != nil {

models/fms/contract_payment_service_amount.go

@@ -54,6 +54,7 @@ type ContractPaymentServiceAmountItem struct {
 	ServiceTemplatePid             int     `json:"service_template_pid" description:"套餐父级ID"`
 	ServiceTemplateName            string  `json:"service_template_name"`
 	Amount                         float64 `json:"amount" description:"分配金额"`
+	ServiceProductId               int     `json:"service_product_id" description:"套餐类型：1ficc套餐，2权益套餐"`
 }
 
 // DistributePaymentServiceAmountReq 到款登记-分配套餐金额请求体

models/fms/contract_service_template.go

@@ -128,6 +128,7 @@ type ContractServiceTemplateFormat struct {
 	FormatTitle        string
 	ServiceTemplateId  int
 	ServiceTemplatePid int
+	ServiceProductId   int
 }
 
 type ContractServiceTemplateFormatList []ContractServiceTemplateFormat

services/fms/contract_register.go

@@ -356,6 +356,7 @@ func GetContractServiceNameFormat(registerIds []int) (serviceNameMap map[int]str
 						FormatTitle:        formatTitle,
 						ServiceTemplateId:  fullItem.ServiceTemplateId,
 						ServiceTemplatePid: fullItem.Pid,
+						ServiceProductId:   fullItem.ProductId,
 					}
 					serviceFormatMap[item.ContractRegisterId] = append(serviceFormatMap[item.ContractRegisterId], tmp)
 				}
@@ -365,6 +366,7 @@ func GetContractServiceNameFormat(registerIds []int) (serviceNameMap map[int]str
 					FormatTitle:        fullItem.Title,
 					ServiceTemplateId:  fullItem.ServiceTemplateId,
 					ServiceTemplatePid: fullItem.Pid,
+					ServiceProductId:   fullItem.ProductId,
 				}
 				serviceFormatMap[item.ContractRegisterId] = append(serviceFormatMap[item.ContractRegisterId], tmp)
 			}
@@ -388,6 +390,7 @@ func GetContractServiceNameFormat(registerIds []int) (serviceNameMap map[int]str
 				FormatTitle:       formatTitle,
 				ServiceTemplateId: templateId,
 				ServiceTemplatePid: pid,
+				ServiceProductId:   sv[0].ProductId,
 			}
 			serviceFormatMap[k] = append(serviceFormatMap[k], tmp)
 		}