fix: 详情返回字段

controller/contract/register.go

@@ -234,6 +234,7 @@ func (rg *RegisterController) Add(c *gin.Context) {
 	ob.ContractStatus = req.ContractStatus
 	ob.RegisterStatus = fms.ContractRegisterStatusIng
 	ob.Remark = req.Remark
+	ob.ServiceRemark = req.ServiceRemark
 	ob.Set()
 	// 补充协议直接完成
 	if req.ContractType == fms.ContractTypePlus {
@@ -364,11 +365,12 @@ func (rg *RegisterController) Edit(c *gin.Context) {
 		item.RegisterStatus = fms.ContractRegisterStatusComplete
 	}
 	item.Remark = req.Remark
+	item.ServiceRemark = req.ServiceRemark
 	item.ModifyTime = nowTime
 	updateCols := []string{
 		"ContractCode", "CrmContractId", "ContractSource", "CompanyName", "SellerId", "SellerName",
 		"ContractType", "ContractAmount", "StartDate", "EndDate", "SignDate", "AgreedPayTime", "ContractStatus",
-		"RegisterStatus", "Remark", "ModifyTime",
+		"RegisterStatus", "Remark", "ModifyTime", "ServiceRemark",
 	}
 
 	// 套餐信息

models/fms/contract_register.go

@@ -104,9 +104,11 @@ type ContractRegisterListReq struct {
 type ContractRegisterItem struct {
 	ContractRegisterId int     `json:"contract_register_id" description:"登记ID"`
 	ContractCode       string  `json:"contract_code" description:"合同编号"`
+	PayContractCode    string  `json:"pay_contract_code" description:"代付合同编号"`
 	CrmContractId      int     `json:"crm_contract_id" description:"CRM系统-合同ID"`
 	ContractSource     int     `json:"contract_source" description:"合同来源: 0-非系统合同导入; 1-CRM合同导入"`
 	CompanyName        string  `json:"company_name" description:"客户名称"`
+	PayCompanyName     string  `json:"pay_company_name" description:"代付方-客户名称"`
 	SellerId           int     `json:"seller_id" description:"CRM系统-销售ID"`
 	SellerName         string  `json:"seller_name" description:"CRM系统-销售名称"`
 	ContractType       int     `json:"contract_type" description:"合同类型: 1-新签; 2-续约"`
@@ -120,6 +122,7 @@ type ContractRegisterItem struct {
 	ContractStatus     int     `json:"contract_status" description:"合同状态: 1-已审批; 2-单章寄出; 3-已签回"`
 	RegisterStatus     int     `json:"register_status" description:"登记状态: 1-进行中; 2-已完成;"`
 	Remark             string  `json:"remark" description:"备注信息"`
+	ServiceRemark      string  `json:"service_remark" description:"套餐备注信息"`
 	CreateTime         string  `json:"create_time" description:"登记时间"`
 }
 
@@ -325,9 +328,11 @@ func formatContractRegister2Item(item *ContractRegister) (formatItem *ContractRe
 	formatItem = new(ContractRegisterItem)
 	formatItem.ContractRegisterId = item.ContractRegisterId
 	formatItem.ContractCode = item.ContractCode
+	formatItem.PayContractCode = item.PayContractCode
 	formatItem.CrmContractId = item.CrmContractId
 	formatItem.ContractSource = item.ContractSource
 	formatItem.CompanyName = item.CompanyName
+	formatItem.PayCompanyName = item.PayCompanyName
 	formatItem.SellerId = item.SellerId
 	formatItem.SellerName = item.SellerName
 	formatItem.ContractType = item.ContractType
@@ -341,6 +346,7 @@ func formatContractRegister2Item(item *ContractRegister) (formatItem *ContractRe
 	formatItem.ContractStatus = item.ContractStatus
 	formatItem.RegisterStatus = item.RegisterStatus
 	formatItem.Remark = item.Remark
+	formatItem.ServiceRemark = item.ServiceRemark
 	formatItem.CreateTime = utils.TimeTransferString(utils.FormatDateTime, item.CreateTime)
 	return
 }