Merge branch 'fms_3.0'

# Conflicts:
#	controller/census/invoice_payment.go

controller/census/invoice_payment.go

@@ -27,258 +27,6 @@ import (
 // InvoicePaymentController 商品到款统计
 type InvoicePaymentController struct{}
 
-// List2 原版(已废弃)
-//func (ct *InvoicePaymentController) List2(c *gin.Context) {
-//	var req fms.InvoicePaymentCensusListReq
-//	if e := c.BindQuery(&req); e != nil {
-//		err, ok := e.(validator.ValidationErrors)
-//		if !ok {
-//			resp.FailData("参数解析失败", "Err:"+e.Error(), c)
-//			return
-//		}
-//		resp.FailData("参数解析失败", err.Translate(global.Trans), c)
-//		return
-//	}
-//
-//	cond := `1 = 1`
-//	pars := make([]interface{}, 0)
-//	// 合同编号/客户姓名/销售
-//	if req.Keyword != "" {
-//		kw := "%" + req.Keyword + "%"
-//		cond += ` AND b.company_name LIKE ? OR a.seller_name LIKE ?`
-//		pars = append(pars, kw, kw)
-//	}
-//	if req.SellGroupId > 0 {
-//		cond += ` AND a.seller_group_id = ?`
-//		pars = append(pars, req.SellGroupId)
-//	}
-//	// 套餐筛选
-//	if req.ServiceType != 0 {
-//		registerIds, e := fms.GetContractRegisterIdsByTempId(req.ServiceType)
-//		if e != nil {
-//			resp.FailMsg("获取失败", "获取合同登记IDs失败, Err: "+e.Error(), c)
-//			return
-//		}
-//		if len(registerIds) > 0 {
-//			cond += ` AND b.contract_register_id IN ?`
-//			pars = append(pars, registerIds)
-//		} else {
-//			cond += ` AND 1 = 2`
-//		}
-//	}
-//	// 开票到款日期
-//	if req.TimeType > 0 && req.StartDate != "" && req.EndDate != "" {
-//		st := fmt.Sprint(req.StartDate, " 00:00:00")
-//		ed := fmt.Sprint(req.EndDate, " 23:59:59")
-//		cond += ` AND a.invoice_type = ? AND (a.invoice_time BETWEEN ? AND ?)`
-//		pars = append(pars, req.TimeType, st, ed)
-//	}
-//	// 已开票
-//	if req.HasInvoice == 1 && req.HasPayment == 0 {
-//		cond += ` AND a.invoice_type = 1`
-//	}
-//	// 已到款
-//	if req.HasInvoice == 0 && req.HasPayment == 1 {
-//		cond += ` AND a.invoice_type = 2`
-//	}
-//
-//	page := new(base.Page)
-//	page.SetPageSize(req.PageSize)
-//	page.SetCurrent(req.Current)
-//	page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: false})
-//	page.AddOrderItem(base.OrderItem{Column: "b.contract_register_id", Asc: true})
-//	if req.IsExport == 1 {
-//		page.SetPageSize(10000)
-//		page.SetCurrent(1)
-//	}
-//
-//	list, allRegisterIds, e := fms.GetInvoicePaymentCensusPageList(page, cond, pars)
-//	if e != nil {
-//		resp.FailMsg("获取失败", "获取商品到款统计列表失败, Err: "+e.Error(), c)
-//		return
-//	}
-//	total := int64(len(allRegisterIds))
-//	registerIds := make([]int, 0)
-//	for i := range list {
-//		registerIds = append(registerIds, list[i].ContractRegisterId)
-//	}
-//
-//	results := new(fms.InvoicePaymentCensusResp)
-//	if len(registerIds) > 0 {
-//		// 获取开票到款列表
-//		ivCond := `contract_register_id IN ?`
-//		ivPars := make([]interface{}, 0)
-//		ivPars = append(ivPars, registerIds)
-//		iv := new(fms.ContractInvoice)
-//		invoiceList, e := iv.List(ivCond, ivPars, "")
-//		if e != nil {
-//			resp.FailMsg("获取失败", "获取开票到款列表失败, Err: "+e.Error(), c)
-//			return
-//		}
-//		// 取出开票、到款
-//		invoiceMap := make(map[int][]*fms.ContractInvoice, 0)
-//		paymentMap := make(map[int][]*fms.ContractInvoice, 0)
-//		paymentIds := make([]int, 0)
-//		for i := range invoiceList {
-//			if invoiceMap[invoiceList[i].ContractRegisterId] == nil {
-//				invoiceMap[invoiceList[i].ContractRegisterId] = make([]*fms.ContractInvoice, 0)
-//			}
-//			if paymentMap[invoiceList[i].ContractRegisterId] == nil {
-//				paymentMap[invoiceList[i].ContractRegisterId] = make([]*fms.ContractInvoice, 0)
-//			}
-//			if invoiceList[i].InvoiceType == fms.ContractInvoiceTypeMake {
-//				invoiceMap[invoiceList[i].ContractRegisterId] = append(invoiceMap[invoiceList[i].ContractRegisterId], invoiceList[i])
-//			}
-//			if invoiceList[i].InvoiceType == fms.ContractInvoiceTypePay {
-//				paymentMap[invoiceList[i].ContractRegisterId] = append(paymentMap[invoiceList[i].ContractRegisterId], invoiceList[i])
-//				paymentIds = append(paymentIds, invoiceList[i].ContractInvoiceId)
-//			}
-//		}
-//
-//		// 合同套餐
-//		contractServiceCond := `contract_register_id IN ?`
-//		contractServicePars := make([]interface{}, 0)
-//		contractServicePars = append(contractServicePars, registerIds)
-//		contractServiceOB := new(fms.ContractService)
-//		contractServiceList, e := contractServiceOB.List(contractServiceCond, contractServicePars)
-//		if e != nil {
-//			resp.FailMsg("获取失败", "获取合同套餐列表失败, Err:"+e.Error(), c)
-//			return
-//		}
-//		contractServiceMap := make(map[int][]*fms.ContractService, 0)
-//		servicesNameMap := make(map[int][]string, 0)
-//		for i := range contractServiceList {
-//			if contractServiceMap[contractServiceList[i].ContractRegisterId] == nil {
-//				contractServiceMap[contractServiceList[i].ContractRegisterId] = make([]*fms.ContractService, 0)
-//			}
-//			contractServiceMap[contractServiceList[i].ContractRegisterId] = append(contractServiceMap[contractServiceList[i].ContractRegisterId], contractServiceList[i])
-//			servicesNameMap[contractServiceList[i].ContractRegisterId] = append(servicesNameMap[contractServiceList[i].ContractRegisterId], contractServiceList[i].Title)
-//		}
-//
-//		// 到款套餐分配
-//		serviceAmountMap := make(map[int][]*fms.ContractPaymentServiceAmount, 0)
-//		if len(paymentIds) > 0 {
-//			serviceAmountCond := `contract_payment_id IN ?`
-//			serviceAmountPars := make([]interface{}, 0)
-//			serviceAmountPars = append(serviceAmountPars, paymentIds)
-//			serviceAmountOB := new(fms.ContractPaymentServiceAmount)
-//			serviceAmountList, e := serviceAmountOB.List(serviceAmountCond, serviceAmountPars)
-//			if e != nil {
-//				resp.FailMsg("获取失败", "获取到款套餐分配列表失败, Err:"+e.Error(), c)
-//				return
-//			}
-//			for i := range serviceAmountList {
-//				if serviceAmountMap[serviceAmountList[i].ContractRegisterId] == nil {
-//					serviceAmountMap[serviceAmountList[i].ContractRegisterId] = make([]*fms.ContractPaymentServiceAmount, 0)
-//				}
-//				serviceAmountMap[serviceAmountList[i].ContractRegisterId] = append(serviceAmountMap[serviceAmountList[i].ContractRegisterId], serviceAmountList[i])
-//			}
-//		}
-//
-//		// 整合响应数据
-//		respList := make([]*fms.InvoicePaymentCensusItem, 0)
-//		for i := range list {
-//			v := new(fms.InvoicePaymentCensusItem)
-//			v.ContractRegisterId = list[i].ContractRegisterId
-//			v.CompanyName = list[i].CompanyName
-//			v.NewCompany = list[i].NewCompany
-//			v.StartDate = list[i].StartDate.Format(utils.FormatDate)
-//			v.EndDate = list[i].EndDate.Format(utils.FormatDate)
-//			svList := servicesNameMap[list[i].ContractRegisterId]
-//			v.ServicesName = strings.Join(svList, ",")
-//			// 格式化(合并)开票到款数据
-//			v.InvoicePaymentList = fmsService.MergeInvoiceList2InvoicePaymentCensusInfo(invoiceMap[list[i].ContractRegisterId], paymentMap[list[i].ContractRegisterId],
-//				contractServiceMap[list[i].ContractRegisterId], serviceAmountMap[list[i].ContractRegisterId])
-//			respList = append(respList, v)
-//		}
-//
-//		// 开票到款金额合计(换算后)
-//		amountTotalCond := `contract_register_id IN ?`
-//		amountTotalPars := make([]interface{}, 0)
-//		amountTotalPars = append(amountTotalPars, allRegisterIds)
-//		amountTotalList, e := fms.GetContractInvoiceAmountTotal(amountTotalCond, amountTotalPars)
-//		if e != nil {
-//			resp.FailMsg("获取失败", "获取开票到款金额合计失败, Err:"+e.Error(), c)
-//			return
-//		}
-//		amountTotalMap := make(map[int]float64)
-//		for i := range amountTotalList {
-//			amountTotalMap[amountTotalList[i].InvoiceType] = amountTotalList[i].TotalAmount
-//		}
-//		invoiceTotal, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", amountTotalMap[fms.ContractInvoiceTypeMake]), 64)
-//		paymentTotal, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", amountTotalMap[fms.ContractInvoiceTypePay]), 64)
-//
-//		// 分币种金额统计
-//		currencyOB := new(fms.CurrencyUnit)
-//		currencyCond := `enable = 1`
-//		currencyPars := make([]interface{}, 0)
-//		currencyList, e := currencyOB.List(currencyCond, currencyPars)
-//		if e != nil {
-//			resp.FailMsg("获取失败", "获取货币列表失败, Err: "+e.Error(), c)
-//			return
-//		}
-//		unitMap := make(map[string]string)
-//		invoiceCurrencyTotals := make([]*fms.InvoiceListCurrencyTotal, 0)
-//		paymentCurrencyTotals := make([]*fms.InvoiceListCurrencyTotal, 0)
-//		for i := range currencyList {
-//			unitMap[currencyList[i].Code] = currencyList[i].UnitName
-//			invoiceCurrencyTotals = append(invoiceCurrencyTotals, &fms.InvoiceListCurrencyTotal{
-//				Name:     currencyList[i].Name,
-//				UnitName: currencyList[i].UnitName,
-//				Code:     currencyList[i].Code,
-//				FlagImg:  currencyList[i].FlagImg,
-//			})
-//			paymentCurrencyTotals = append(paymentCurrencyTotals, &fms.InvoiceListCurrencyTotal{
-//				Name:     currencyList[i].Name,
-//				UnitName: currencyList[i].UnitName,
-//				Code:     currencyList[i].Code,
-//				FlagImg:  currencyList[i].FlagImg,
-//			})
-//		}
-//		sumList, e := fms.GetInvoiceListCurrencySum(amountTotalCond, amountTotalPars, "currency_unit, invoice_type")
-//		if e != nil {
-//			resp.FailMsg("获取失败", "获取商品到款统计货币合计金额失败, Err: "+e.Error(), c)
-//			return
-//		}
-//		invoiceSumMap := make(map[string]float64)
-//		paymentSumMap := make(map[string]float64)
-//		for i := range sumList {
-//			if sumList[i].InvoiceType == fms.ContractInvoiceTypeMake {
-//				invoiceSumMap[sumList[i].CurrencyUnit] = sumList[i].OriginAmountTotal
-//				continue
-//			}
-//			if sumList[i].InvoiceType == fms.ContractInvoiceTypePay {
-//				paymentSumMap[sumList[i].CurrencyUnit] = sumList[i].OriginAmountTotal
-//			}
-//		}
-//		for i := range invoiceCurrencyTotals {
-//			a, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", invoiceSumMap[invoiceCurrencyTotals[i].Code]), 64)
-//			invoiceCurrencyTotals[i].Amount = a
-//		}
-//		for i := range paymentCurrencyTotals {
-//			a, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", paymentSumMap[paymentCurrencyTotals[i].Code]), 64)
-//			paymentCurrencyTotals[i].Amount = a
-//		}
-//
-//		results.DataList = respList
-//		results.InvoiceTotal = invoiceTotal
-//		results.PaymentTotal = paymentTotal
-//		results.InvoiceCurrencyTotal = invoiceCurrencyTotals
-//		results.PaymentCurrencyTotal = paymentCurrencyTotals
-//	}
-//
-//	// 是否导出
-//	if req.IsExport == 1 {
-//		ExportInvoicePaymentCensusList(c, results)
-//		return
-//	}
-//	page.SetTotal(total)
-//	baseData := new(base.BaseData)
-//	baseData.SetPage(page)
-//	baseData.SetList(results)
-//	resp.OkData("获取成功", baseData, c)
-//}
-
 // ExportInvoicePaymentCensusList 导出商品到款统计列表
 func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentCensusResp) {
 	list := results.DataList
@@ -331,7 +79,7 @@ func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentC
 	sheet.AddRow()
 
 	// 表头, 套餐动态获取
-	rowTitle := []string{"序号", "客户名称", "代付方", "是否新客户", "合同有效期", "开票日", "开票金额", "到款日", "到款金额", "付款方式", "销售",
+	rowTitle := []string{"序号", "客户名称", "代付方", "是否新客户", "合同起始日期", "合同结束日期", "开票日", "开票金额", "开票换算金额（元）", "到款日", "到款金额", "到款换算金额（元）", "付款方式", "销售",
 		"销售组别", "销售类型"}
 	serviceTempCond := ``
 	serviceTempPars := make([]interface{}, 0)
@@ -440,14 +188,20 @@ func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentC
 		// 合同有效期
 		colD := dataRow.AddCell()
 		colD.VMerge = mergeRowNum
-		colD.SetString(fmt.Sprint(v.StartDate, "至", v.EndDate))
+		colD.SetString(v.StartDate)
+
+		colF := dataRow.AddCell()
+		colF.VMerge = mergeRowNum
+		colF.SetString(v.EndDate)
 		// 开票到款信息
 		for k2, v2 := range v.InvoicePaymentList {
 			rowData := []string{
 				v2.InvoiceDate,                                // 开票日
-				fmt.Sprint(v2.InvoiceAmount),                  // 开票金额
+				fmt.Sprint(v2.InvoiceOriginAmount),            // 开票金额
+				fmt.Sprint(v2.InvoiceAmount),                  // 开票换算金额
 				v2.PaymentDate,                                // 到款日
-				fmt.Sprint(v2.PaymentAmount),                  // 到款金额
+				fmt.Sprint(v2.PaymentOriginAmount),            // 到款金额
+				fmt.Sprint(v2.PaymentAmount),                  // 到款换算金额
 				fms.ContractPaymentPayTypeNameMap[v2.PayType], // 付款方式
 				v2.SellerName,                                 // 销售
 				v2.SellerGroupName,                            // 组别
@@ -781,6 +535,7 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 				v.InvoiceId = summaryList[i].InvoiceId
 				v.InvoiceDate = utils.TimeTransferString(utils.FormatDate, summaryList[i].InvoiceDate)
 				v.InvoiceAmount = summaryList[i].InvoiceAmount
+				v.InvoiceOriginAmount = summaryList[i].InvoiceOriginAmount
 				v.SellerId = summaryList[i].SellerId
 				v.SellerName = summaryList[i].SellerName
 				v.SellerGroupId = summaryList[i].SellerGroupId
@@ -791,6 +546,7 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 				v.PaymentId = summaryList[i].PaymentId
 				v.PaymentDate = utils.TimeTransferString(utils.FormatDate, summaryList[i].PaymentDate)
 				v.PaymentAmount = summaryList[i].PaymentAmount
+				v.PaymentOriginAmount = summaryList[i].PaymentOriginAmount
 				v.PayType = summaryList[i].PayType
 				// 套餐到款分配
 				svaList := make([]*fms.ContractPaymentServiceAmountItem, 0)
@@ -1055,9 +811,6 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 		historyCond += ` AND new_company = 0 `
 	}
 
-
-
-
 	var latestTime time.Time
 
 	invoiceItem, err := fms.GetLatestIncome(cond, pars)
@@ -1108,7 +861,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 			req.StartDate = "2023-04"
 			req.EndDate = "3023-04"
 		} else {
-			startDateTime,_ := time.Parse(utils.FormatMonth, req.StartDate)
+			startDateTime, _ := time.Parse(utils.FormatMonth, req.StartDate)
 			if startDateTime.Before(historyTime) {
 				req.StartDate = "2023-04"
 			}
@@ -1318,7 +1071,7 @@ func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeL
 						partAccumulate = 0.0
 					}
 				}
-			} else if endDateTime.Before(historyTime) || endDateTime.Equal(historyTime)  {
+			} else if endDateTime.Before(historyTime) || endDateTime.Equal(historyTime) {
 				//全部走旧查询
 				//fmt.Println("旧查询")
 				//fmt.Println("st:",st)
@@ -1850,26 +1603,28 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 					if v.ServiceProductId == 1 {
 						if serviceAmount, ok := serviceAmountMap[v.ContractRegisterId]; ok {
 							item := fms.NotInvoicePaymentSummaryItem{
-								NotInvoicedAmountTotal: serviceAmount[2].ServiceAmount,
-								ServiceProductId:       2,
+								NotInvoicedAmountOriginTotal: serviceAmount[2].ServiceAmount,
+								ServiceProductId:             2,
 							}
 							item.SellerId = v.SellerId
 							item.SellerName = v.SellerName
 							item.RaiSellerId = v.RaiSellerId
 							item.RaiSellerName = v.RaiSellerName
+							item.RMBRate = v.RMBRate
 
 							NotInvoiceSummaryMap[v.ContractRegisterId] = append(NotInvoiceSummaryMap[v.ContractRegisterId], &item)
 						}
 					} else {
 						if serviceAmount, ok := serviceAmountMap[v.ContractRegisterId]; ok {
 							item := fms.NotInvoicePaymentSummaryItem{
-								NotInvoicedAmountTotal: serviceAmount[1].ServiceAmount,
-								ServiceProductId:       1,
+								NotInvoicedAmountOriginTotal: serviceAmount[1].ServiceAmount,
+								ServiceProductId:             1,
 							}
 							item.SellerId = v.SellerId
 							item.SellerName = v.SellerName
 							item.RaiSellerId = v.RaiSellerId
 							item.RaiSellerName = v.RaiSellerName
+							item.RMBRate = v.RMBRate
 
 							NotInvoiceSummaryMap[v.ContractRegisterId] = append(NotInvoiceSummaryMap[v.ContractRegisterId], &item)
 						}
@@ -1879,23 +1634,26 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 					// 套餐是ficc权益都有的，但是都没进行过开票到款，补充两个套餐的内容，直接用合同金额当作未开票金额即可
 					if serviceAmount, ok := serviceAmountMap[v.ContractRegisterId]; ok {
 						item1 := fms.NotInvoicePaymentSummaryItem{
-							NotInvoicedAmountTotal: serviceAmount[2].ServiceAmount,
-							ServiceProductId:       2,
+							NotInvoicedAmountOriginTotal: serviceAmount[2].ServiceAmount,
+							ServiceProductId:             2,
 						}
 						item1.SellerId = v.SellerId
 						item1.SellerName = v.SellerName
 						item1.RaiSellerId = v.RaiSellerId
 						item1.RaiSellerName = v.RaiSellerName
+						item1.RMBRate = v.RMBRate
+
 						NotInvoiceSummaryMap[v.ContractRegisterId] = append(NotInvoiceSummaryMap[v.ContractRegisterId], &item1)
 
 						item2 := fms.NotInvoicePaymentSummaryItem{
-							NotInvoicedAmountTotal: serviceAmount[1].ServiceAmount,
-							ServiceProductId:       1,
+							NotInvoicedAmountOriginTotal: serviceAmount[1].ServiceAmount,
+							ServiceProductId:             1,
 						}
 						item2.SellerId = v.SellerId
 						item2.SellerName = v.SellerName
 						item2.RaiSellerId = v.RaiSellerId
 						item2.RaiSellerName = v.RaiSellerName
+						item2.RMBRate = v.RMBRate
 
 						NotInvoiceSummaryMap[v.ContractRegisterId] = append(NotInvoiceSummaryMap[v.ContractRegisterId], &item2)
 					}
@@ -1903,13 +1661,14 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 					// 只有ficc套餐，但是未进行过开票到款，手动补充信息
 					if serviceAmount, ok := serviceAmountMap[v.ContractRegisterId]; ok {
 						item1 := fms.NotInvoicePaymentSummaryItem{
-							NotInvoicedAmountTotal: serviceAmount[1].ServiceAmount,
-							ServiceProductId:       1,
+							NotInvoicedAmountOriginTotal: serviceAmount[1].ServiceAmount,
+							ServiceProductId:             1,
 						}
 						item1.SellerId = v.SellerId
 						item1.SellerName = v.SellerName
 						item1.RaiSellerId = v.RaiSellerId
 						item1.RaiSellerName = v.RaiSellerName
+						item1.RMBRate = v.RMBRate
 
 						NotInvoiceSummaryMap[v.ContractRegisterId] = append(NotInvoiceSummaryMap[v.ContractRegisterId], &item1)
 					}
@@ -1917,13 +1676,14 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 					// 只有权益套餐，但是未进行过开票到款，手动补充信息
 					if serviceAmount, ok := serviceAmountMap[v.ContractRegisterId]; ok {
 						item2 := fms.NotInvoicePaymentSummaryItem{
-							NotInvoicedAmountTotal: serviceAmount[2].ServiceAmount,
-							ServiceProductId:       2,
+							NotInvoicedAmountOriginTotal: serviceAmount[2].ServiceAmount,
+							ServiceProductId:             2,
 						}
 						item2.SellerId = v.SellerId
 						item2.SellerName = v.SellerName
 						item2.RaiSellerId = v.RaiSellerId
 						item2.RaiSellerName = v.RaiSellerName
+						item2.RMBRate = v.RMBRate
 
 						NotInvoiceSummaryMap[v.ContractRegisterId] = append(NotInvoiceSummaryMap[v.ContractRegisterId], &item2)
 					}
@@ -1956,34 +1716,37 @@ func (ct *InvoicePaymentController) NotInvoiceList(c *gin.Context) {
 			}
 
 			for registerId, list := range NotInvoiceSummaryMap {
-				for _, v := range list {
+				for i, v := range list {
 					// fmt.Println("v.ContractRegisterId", v.ContractRegisterId)
 					// fmt.Println("v.ServiceProductId:", v.ServiceProductId)
 					// fmt.Println("v.NotInvoicedAmountTotal:", v.NotInvoicedAmountTotal)
 					// fmt.Println("registerId:",registerId)
-					if v.NotInvoicedAmountTotal == 0 {
+					if v.NotInvoicedAmountOriginTotal == 0 {
 						if v.InvoiceAmountTotal > v.PaymentAmountTotal {
 							// 有合规登记或补录合同过的，有serviceAmountMap信息
 							if _, ok := serviceAmountMap[registerId]; ok {
 								if _, ok2 := serviceAmountMap[registerId][v.ServiceProductId]; ok2 {
-									v.NotInvoicedAmountTotal = serviceAmountMap[registerId][v.ServiceProductId].ServiceAmount - v.InvoiceAmountTotal
+									list[i].NotInvoicedAmountOriginTotal = serviceAmountMap[registerId][v.ServiceProductId].ServiceAmount - v.InvoiceAmountTotal
 								}
 							} else {
 								// 预登记没有合同套餐金额信息
-								v.NotInvoicedAmountTotal = v.InvoiceAmountTotal - v.PaymentAmountTotal
+								list[i].NotInvoicedAmountOriginTotal = v.InvoiceAmountTotal - v.PaymentAmountTotal
 							}
 						} else {
 							if _, ok := serviceAmountMap[registerId]; ok {
 								// 有合规登记或补录合同过的，有serviceAmountMap信息
 								if _, ok2 := serviceAmountMap[registerId][v.ServiceProductId]; ok2 {
-									v.NotInvoicedAmountTotal = serviceAmountMap[registerId][v.ServiceProductId].ServiceAmount - v.PaymentAmountTotal
+									list[i].NotInvoicedAmountOriginTotal = serviceAmountMap[registerId][v.ServiceProductId].ServiceAmount - v.PaymentAmountTotal
 								}
 							} else {
 								// 预登记没有合同套餐金额信息
-								v.NotInvoicedAmountTotal = v.PaymentAmountTotal - v.InvoiceAmountTotal
+								list[i].NotInvoicedAmountOriginTotal = v.PaymentAmountTotal - v.InvoiceAmountTotal
 							}
 						}
 					}
+					list[i].NotInvoicedAmountTotal = v.NotInvoicedAmountOriginTotal / v.RMBRate
+					list[i].NotInvoicedAmountTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", v.NotInvoicedAmountTotal), 64)
+
 					// 补充销售信息
 					if v.SellerId > 0 && v.RaiSellerId > 0 {
 						if v.ServiceProductId == 1 {
@@ -2363,6 +2126,7 @@ func (ct *InvoicePaymentController) NotPaymentList(c *gin.Context) {
 				v.InvoiceId = summaryList[i].InvoiceId
 				v.InvoiceDate = utils.TimeTransferString(utils.FormatDate, summaryList[i].InvoiceDate)
 				v.InvoiceAmount = summaryList[i].InvoiceAmount
+				v.InvoiceOriginAmount = summaryList[i].InvoiceOriginAmount
 				v.SellerId = summaryList[i].SellerId
 				v.SellerName = summaryList[i].SellerName
 				v.SellerGroupId = summaryList[i].SellerGroupId
@@ -2374,7 +2138,9 @@ func (ct *InvoicePaymentController) NotPaymentList(c *gin.Context) {
 				v.PaymentId = summaryList[i].PaymentId
 				v.PaymentDate = utils.TimeTransferString(utils.FormatDate, summaryList[i].PaymentDate)
 				v.PaymentAmount = summaryList[i].PaymentAmount
+				v.PaymentOriginAmount = summaryList[i].PaymentOriginAmount
 				v.PayType = summaryList[i].PayType
+				v.NotPaymentOriginAmount = summaryList[i].InvoiceOriginAmount - summaryList[i].PaymentOriginAmount
 				v.NotPaymentAmount = summaryList[i].InvoiceAmount - summaryList[i].PaymentAmount
 				v.ServiceProductId = summaryList[i].ServiceProductId
 				v.UnitName = unitMap[summaryList[i].CurrencyUnit]
@@ -2579,7 +2345,7 @@ func ExportNotInvoiceCensusList(c *gin.Context, results *fms.NotInvoicePaymentCe
 	sheet.AddRow()
 
 	// 数据表头
-	rowTitle := []string{"序号", "客户名称", "合同编号", "合同开始时间", "合同结束时间", "合同金额", "金额单位", "未开票金额", "套餐类型", "销售", "销售组别", "销售类型"}
+	rowTitle := []string{"序号", "客户名称", "合同编号", "合同开始时间", "合同结束时间", "合同金额", "金额单位", "未开票金额", "未开票换算金额", "套餐类型", "销售", "销售组别", "销售类型"}
 	titleRow := sheet.AddRow()
 	for i := range rowTitle {
 		v := titleRow.AddCell()
@@ -2686,7 +2452,8 @@ func ExportNotInvoiceCensusList(c *gin.Context, results *fms.NotInvoicePaymentCe
 
 			} else {
 
-				dataRow.AddCell().SetString(fmt.Sprintf("%.2f", item.NotInvoicedAmountTotal)) // 未开票金额
+				dataRow.AddCell().SetString(fmt.Sprintf("%.2f", item.NotInvoicedAmountOriginTotal)) // 未开票金额
+				dataRow.AddCell().SetString(fmt.Sprintf("%.2f", item.NotInvoicedAmountTotal))       // 未开票换算金额
 
 				dataRow.AddCell().SetString(serviceProductIdMap[item.ServiceProductId]) // 套餐类型
 
@@ -2709,7 +2476,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]
 					}
@@ -2782,7 +2551,7 @@ func ExportNotPaymentCensusList(c *gin.Context, results *fms.NotInvoicePaymentCe
 	sheet.AddRow()
 
 	// 表头, 套餐动态获取
-	rowTitle := []string{"序号", "客户名称", "合同编号", "合同有效期", "套餐类型", "开票日", "开票金额", "金额单位", "开票销售",
+	rowTitle := []string{"序号", "客户名称", "合同编号", "合同起始日期", "合同结束日期", "套餐类型", "开票日", "开票金额", "金额单位", "开票换算金额", "开票销售",
 		"销售组别", "销售类型"}
 
 	titleRow := sheet.AddRow()
@@ -2817,7 +2586,11 @@ func ExportNotPaymentCensusList(c *gin.Context, results *fms.NotInvoicePaymentCe
 		// 合同有效期
 		colD := dataRow.AddCell()
 		colD.VMerge = mergeRowNum
-		colD.SetString(fmt.Sprint(v.StartDate, "至", v.EndDate))
+		colD.SetString(v.StartDate)
+
+		colF := dataRow.AddCell()
+		colF.VMerge = mergeRowNum
+		colF.SetString(v.EndDate)
 		// 套餐类型
 		colE := dataRow.AddCell()
 		colE.VMerge = mergeRowNum
@@ -2826,12 +2599,13 @@ func ExportNotPaymentCensusList(c *gin.Context, results *fms.NotInvoicePaymentCe
 		// 开票到款信息
 		for _, v2 := range v.InvoicePaymentList {
 			rowData := []string{
-				v2.InvoiceDate,                  // 开票日
-				fmt.Sprint(v2.NotPaymentAmount), // 开票金额
-				v2.UnitName,                     // 开票金额
-				v2.SellerName,                   // 销售
-				v2.SellerGroupName,              // 组别
-				sellerTypeMap[v2.SellerType],    // 销售类型
+				v2.InvoiceDate,                        // 开票日
+				fmt.Sprint(v2.NotPaymentOriginAmount), // 开票原始金额
+				v2.UnitName,                           // 开票金额
+				fmt.Sprint(v2.NotPaymentAmount),       // 开票换算金额
+				v2.SellerName,                         // 销售
+				v2.SellerGroupName,                    // 组别
+				sellerTypeMap[v2.SellerType],          // 销售类型
 			}
 			for i := range rowData {
 				dataRow.AddCell().SetString(rowData[i])

controller/contract/pre_register.go

@@ -1,9 +1,11 @@
 package contract
 
 import (
+	"bytes"
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/go-playground/validator/v10"
+	"github.com/tealeg/xlsx"
 	"hongze/fms_api/controller/resp"
 	"hongze/fms_api/global"
 	"hongze/fms_api/models/base"
@@ -13,6 +15,7 @@ import (
 	crmService "hongze/fms_api/services/crm"
 	fmsService "hongze/fms_api/services/fms"
 	"hongze/fms_api/utils"
+	"net/http"
 	"strconv"
 	"strings"
 	"time"
@@ -22,8 +25,8 @@ import (
 type PreRegisterController struct{}
 
 // InvoiceList
-// @Title 开票/到款列表
-// @Description 开票/到款列表
+// @Title 预登记列表
+// @Description 预登记列表
 // @Param   Keyword			query	string	false	"关键词"
 // @Success 200 {object} fms.ContractInvoiceItem
 // @router /contract/pre_register/list [get]
@@ -46,6 +49,7 @@ func (rg *PreRegisterController) List(c *gin.Context) {
 	if pageIndex <= 0 {
 		pageIndex = 1
 	}
+
 	cond := ` invoice_type IN (3, 4) `
 	pars := make([]interface{}, 0)
 	if req.Keyword != "" {
@@ -70,6 +74,10 @@ func (rg *PreRegisterController) List(c *gin.Context) {
 	page := new(base.Page)
 	page.SetPageSize(req.PageSize)
 	page.SetCurrent(req.Current)
+	if req.IsExport == 1 {
+		page.SetPageSize(10000)
+		page.SetCurrent(1)
+	}
 	sortTypeMap := map[int]bool{0: false, 1: true, 2: false}
 	page.AddOrderItem(base.OrderItem{Column: "create_time", Asc: sortTypeMap[0]})
 
@@ -120,6 +128,10 @@ func (rg *PreRegisterController) List(c *gin.Context) {
 		respList = append(respList, item)
 	}
 
+	if req.IsExport == 1 {
+		ExportPreRegister(c, list)
+		return
+	}
 	page.SetTotal(total)
 	baseData := new(base.BaseData)
 	baseData.SetPage(page)
@@ -1165,7 +1177,7 @@ func (rg *PreRegisterController) Save(c *gin.Context) {
 		if v.ContractInvoiceId != 0 {
 			//更新
 			invoiceHandleType = 1
-			invoiceUpdateCols = append(invoiceUpdateCols, "OriginAmount", "CurrencyUnit",
+			invoiceUpdateCols = append(invoiceUpdateCols, "Amount","OriginAmount", "CurrencyUnit",
 				"InvoiceDate", "Remark", "ServiceProductId", "StartDate", "EndDate", "ModifyTime")
 		} else {
 			//新增
@@ -1268,3 +1280,499 @@ func (rg *PreRegisterController) Save(c *gin.Context) {
 
 	resp.Ok("操作成功", c)
 }
+
+func ExportPreRegister(c *gin.Context,list []*fms.ContractPreRegisterItem) {
+	//var req fms.PreRegisterListReq
+	//if e := c.BindQuery(&req); e != nil {
+	//	err, ok := e.(validator.ValidationErrors)
+	//	if !ok {
+	//		resp.FailData("参数解析失败", "Err:"+e.Error(), c)
+	//		return
+	//	}
+	//	resp.FailData("参数解析失败", err.Translate(global.Trans), c)
+	//	return
+	//}
+	//pageSize := req.PageSize
+	//pageIndex := req.Current
+	//if pageSize <= 0 {
+	//	pageSize = utils.PageSize20
+	//}
+	//if pageIndex <= 0 {
+	//	pageIndex = 1
+	//}
+	//cond := ` invoice_type IN (3, 4) `
+	//pars := make([]interface{}, 0)
+	//if req.Keyword != "" {
+	//	kw := "%" + req.Keyword + "%"
+	//	cond += ` AND company_name LIKE ? `
+	//	pars = append(pars, kw)
+	//}
+	// 货币列表
+	currencyOB := new(fms.CurrencyUnit)
+	currencyCond := `enable = 1`
+	currencyPars := make([]interface{}, 0)
+	currencyList, e := currencyOB.List(currencyCond, currencyPars)
+	if e != nil {
+		resp.FailMsg("获取失败", "获取货币列表失败, Err: "+e.Error(), c)
+		return
+	}
+	unitMap := make(map[string]string)
+	for i := range currencyList {
+		unitMap[currencyList[i].Code] = currencyList[i].UnitName
+	}
+	//
+	//page := new(base.Page)
+	//page.SetPageSize(req.PageSize)
+	//page.SetCurrent(req.Current)
+	//sortTypeMap := map[int]bool{0: false, 1: true, 2: false}
+	//page.AddOrderItem(base.OrderItem{Column: "create_time", Asc: sortTypeMap[0]})
+	//
+	//_, list, e := fms.GetContractPreRegisterItemPageList(page, cond, pars)
+	//if e != nil {
+	//	resp.FailMsg("获取失败", "获取预登记列表失败, Err: "+e.Error(), c)
+	//	return
+	//}
+	//serviceMap := make(map[int]string, 0)
+	registerIds := make([]int, 0)
+	for i := range list {
+		list[i].UnitName = unitMap[list[i].CurrencyUnit]
+		registerIds = append(registerIds, list[i].ContractRegisterId)
+	}
+	// 获取小套餐品种
+	cpCond := `product_id = ? AND permission_name <> ? AND enabled = 1 AND parent_id> 0 `
+	cpPars := make([]interface{}, 0)
+	cpPars = append(cpPars, crm.CompanyProductFicc, crm.ChartPermissionStrategyName)
+	cp := new(crm.ChartPermission)
+	permissionList, e := cp.List(cpCond, cpPars)
+	if e != nil {
+		resp.FailData("获取小套餐品种失败", "Err:"+e.Error(), c)
+		return
+	}
+	permissionLen := len(permissionList)
+	permissionNameIdMap := make(map[string]int)
+	for i := range permissionList {
+		permissionNameIdMap[permissionList[i].PermissionName] = permissionList[i].ChartPermissionId
+	}
+
+	// 获取所有FICC套餐服务
+	serviceList, e := fms.GetContractServiceTemplateMapByProductId(crm.CompanyProductFicc)
+	if e != nil {
+		resp.FailData("获取套餐服务失败", "Err:"+e.Error(), c)
+		return
+	}
+	// 除大小套餐外的其他套餐(下面的导出需要以此动态处理)
+	otherService := make([]*fms.ContractServiceTemplateItem, 0)
+	for i := range serviceList {
+		if serviceList[i].Title != "FICC大套餐" && serviceList[i].Title != "FICC小套餐" {
+			otherService = append(otherService, serviceList[i])
+		}
+	}
+	otherServiceLen := len(otherService)
+
+	// 获取所有权益套餐服务
+	raiServiceList, e := fms.GetContractServiceTemplateAllByProductId(crm.CompanyProductRai)
+	if e != nil {
+		resp.FailData("获取权益套餐服务失败", "Err:"+e.Error(), c)
+		return
+	}
+	raiServiceIdMap := make(map[int]*fms.ContractServiceTemplateItem)
+	for i := range raiServiceList {
+		raiServiceIdMap[raiServiceList[i].ServiceTemplateId] = raiServiceList[i]
+	}
+
+	// 除大小套餐外的其他套餐(下面的导出需要以此动态处理)
+	raiOtherService := make([]*fms.ContractServiceTemplateItem, 0)
+	raiServiceNotShowMap := make(map[int]struct{})
+	for _, v := range raiServiceList {
+		if v.Pid > 0 && raiServiceIdMap[v.Pid].Pid > 0 {
+			raiServiceNotShowMap[v.Pid] = struct{}{}
+			raiServiceNotShowMap[raiServiceIdMap[v.Pid].Pid] = struct{}{}
+		} else if v.Pid > 0 {
+			raiServiceNotShowMap[v.Pid] = struct{}{}
+		}
+	}
+	for _, v := range raiServiceList {
+		if _, ok := raiServiceNotShowMap[v.ServiceTemplateId]; !ok {
+			if v.Pid > 0 {
+				v.ParentTitle = raiServiceIdMap[v.Pid].Title
+			}
+			raiOtherService = append(raiOtherService, v)
+		}
+	}
+	otherServiceLen += len(raiOtherService)
+
+	//套餐金额map
+	serviceAmountMap := make(map[int]map[int]*fms.ContractServiceAmount)
+
+	// 套餐/开票/到款列表
+	serviceMap := make(map[int][]*fms.ContractServiceWithParentTitle)
+	serviceChartPermissionsMap := make(map[int][]int)
+	invoiceMap := make(map[int][]*fms.ContractInvoice)
+	paymentMap := make(map[int][]*fms.ContractInvoice)
+	maxInvoice := 0
+	maxPayment := 0
+	if len(registerIds) > 0 {
+		// 获取套餐信息
+		csCond := `cv.contract_register_id IN ?`
+		csPars := make([]interface{}, 0)
+		csPars = append(csPars, registerIds)
+		cs := new(fms.ContractService)
+		serviceList, e := cs.ListWithWithParentTitle(csCond, csPars)
+		if e != nil {
+			resp.FailData("获取合同套餐列表失败", "Err:"+e.Error(), c)
+			return
+		}
+		for i := range serviceList {
+			cid := serviceList[i].ContractRegisterId
+			if serviceMap[cid] == nil {
+				serviceMap[cid] = make([]*fms.ContractServiceWithParentTitle, 0)
+			}
+			serviceMap[cid] = append(serviceMap[cid], serviceList[i])
+			// 小套餐权限
+			if serviceChartPermissionsMap[cid] == nil {
+				serviceChartPermissionsMap[cid] = make([]int, 0)
+			}
+			if serviceList[i].ChartPermissionIds != "" {
+				ids := utils.JoinStr2IntArr(serviceList[i].ChartPermissionIds, ",")
+				serviceChartPermissionsMap[cid] = append(serviceChartPermissionsMap[cid], ids...)
+			}
+		}
+
+		// 获取合同的套餐金额信息
+		serviceAmountList, e := fms.GetContractServiceAmountByContractRegisterIds(registerIds)
+		if e != nil {
+			resp.FailData("获取合同的套餐金额信息失败", "Err:"+e.Error(), c)
+			return
+		}
+		for _, v := range serviceAmountList {
+			if _, ok := serviceAmountMap[v.ContractRegisterId]; !ok {
+				serviceAmountMap[v.ContractRegisterId] = make(map[int]*fms.ContractServiceAmount)
+			}
+			serviceAmountMap[v.ContractRegisterId][v.ProductId] = v
+		}
+		// 获取开票/到款详情, 并取最大的开票/到款数(用于动态扩展第二列表头)
+		ci := new(fms.ContractInvoice)
+		csCond = `contract_register_id IN ?`
+		csPars = make([]interface{}, 0)
+		csPars = append(csPars, registerIds)
+		invoiceList, e := ci.List(csCond, csPars, "")
+		if e != nil {
+			resp.FailData("获取开票/到款列表失败", "Err:"+e.Error(), c)
+			return
+		}
+		for k := range invoiceList {
+			cid := invoiceList[k].ContractRegisterId
+			if invoiceMap[cid] == nil {
+				invoiceMap[cid] = make([]*fms.ContractInvoice, 0)
+			}
+			if paymentMap[cid] == nil {
+				paymentMap[cid] = make([]*fms.ContractInvoice, 0)
+			}
+			if invoiceList[k].InvoiceType == fms.ContractInvoiceTypeMake {
+				invoiceMap[cid] = append(invoiceMap[cid], invoiceList[k])
+				continue
+			}
+			if invoiceList[k].InvoiceType == fms.ContractInvoiceTypePay {
+				paymentMap[cid] = append(paymentMap[cid], invoiceList[k])
+				continue
+			}
+		}
+		// 取最大开票/到款数
+		for j := range invoiceMap {
+			if len(invoiceMap[j]) > maxInvoice {
+				maxInvoice = len(invoiceMap[j])
+			}
+		}
+		for p := range paymentMap {
+			if len(paymentMap[p]) > maxPayment {
+				maxPayment = len(paymentMap[p])
+			}
+		}
+	}
+
+	// 生成Excel文件
+	xlsxFile := xlsx.NewFile()
+	style := xlsx.NewStyle()
+	alignment := xlsx.Alignment{
+		Horizontal: "center",
+		Vertical:   "center",
+		WrapText:   true,
+	}
+	style.Alignment = alignment
+	style.ApplyAlignment = true
+
+
+	sheetName := "预登记列表"
+	sheet, err := xlsxFile.AddSheet(sheetName)
+	if err != nil {
+		resp.FailData("新增Sheet失败", "Err:"+err.Error(), c)
+		return
+	}
+
+	// 1行表头
+	hInt := 0
+	titleRow := sheet.AddRow()
+	titleRow.SetHeight(40)
+	// 1行1列-右合并两格, 下合并1行
+	cell1 := titleRow.AddCell()
+	cell1.HMerge = 10
+
+	cell1.VMerge = 1
+	cell1.SetString("")
+	cell1.SetStyle(style)
+
+	// 右增两列空白格用于第一列合并, 否则后续单元格合并会有问题
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+	hInt += 13
+
+	titleRow.AddCell().SetString("")
+	hInt += 1
+	// 1行2列
+	cell2 := titleRow.AddCell()
+	cell2.VMerge = 1
+	cell2.SetString("FICC大套餐")
+	cell2.SetStyle(style)
+	hInt++
+
+	// 1行3列-右合并小套餐数
+
+	cell3 := titleRow.AddCell()
+	hInt++
+	cell3.HMerge = permissionLen - 1
+	cell3.VMerge = 1
+	cell3.SetString("FICC小套餐")
+	cell3.SetStyle(style)
+	// 同上右增单元格小套餐数-1的空白单元格用于合并
+	for i := 0; i < permissionLen-1; i++ {
+		titleRow.AddCell().SetString("")
+		hInt++
+	}
+
+	for i := range otherService {
+		cellOther := titleRow.AddCell()
+		cellOther.VMerge = 1
+		hInt++
+		cellOther.SetString(otherService[i].Title)
+		cellOther.SetStyle(style)
+	}
+
+	//权益大套餐
+	cell4 := titleRow.AddCell()
+	cell4.HMerge = 1
+	cell4.VMerge = 1
+	cell4.SetString("权益大套餐")
+	cell4.SetStyle(style)
+	titleRow.AddCell().SetString("")
+	hInt += 2
+
+	//权益分行业套餐
+	cell5 := titleRow.AddCell()
+	//cell5.HMerge = 8
+	cell5.SetString("权益分行业套餐")
+	cell5.SetStyle(style)
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+	titleRow.AddCell().SetString("")
+
+	//第二行，前面几个单元格用于第一行的合并
+	titleRow2 := sheet.AddRow()
+	titleRow2.SetHeight(30)
+	for i := 0; i < hInt; i++ {
+		titleRow2.AddCell().SetString("")
+	}
+
+	//权益分行业套餐
+	row2Cell1 := titleRow2.AddCell()
+	row2Cell1.HMerge = 1
+	row2Cell1.SetString("医药")
+	row2Cell1.SetStyle(style)
+	titleRow2.AddCell().SetString("")
+
+	row2Cell2 := titleRow2.AddCell()
+	row2Cell2.HMerge = 1
+	row2Cell2.SetString("消费")
+	row2Cell2.SetStyle(style)
+	titleRow2.AddCell().SetString("")
+
+	row2Cell3 := titleRow2.AddCell()
+	row2Cell3.HMerge = 1
+	row2Cell3.SetString("科技")
+	row2Cell3.SetStyle(style)
+	titleRow2.AddCell().SetString("")
+
+	row2Cell4 := titleRow2.AddCell()
+	row2Cell4.HMerge = 1
+	row2Cell4.SetString("智造")
+	row2Cell4.SetStyle(style)
+	titleRow2.AddCell().SetString("")
+
+	row2Cell5 := titleRow2.AddCell()
+	row2Cell5.SetString("策略")
+	row2Cell5.SetStyle(style)
+
+	// 第三行表头
+	titleRow3 := sheet.AddRow()
+	titleRow3.SetHeight(60)
+	row3Title := make([]string, 0)
+	row3TitleParent := make([]string, 0)
+	row3Title = append(row3Title, "客户名称", "约定起始日期", "约定结束日期", "合同类型", "开票日期", "开票金额", "开票换算金额", "开票销售",
+		"到款日期", "到款金额", "到款换算金额", "到款销售", "开票备注", "到款备注")
+
+	row3Title = append(row3Title, "FICC大套餐")
+	for i := range permissionList {
+		row3Title = append(row3Title, permissionList[i].PermissionName)
+	}
+	// 其他套餐
+	for i := range otherService {
+		row3Title = append(row3Title, otherService[i].Title)
+	}
+	// 定义二级套餐名称
+	for i := range row3Title {
+		row3TitleParent = append(row3TitleParent, row3Title[i])
+	}
+	// 权益三级套餐
+	for i := range raiOtherService {
+		row3Title = append(row3Title, raiOtherService[i].Title)
+		if raiOtherService[i].ParentTitle != "" {
+			row3TitleParent = append(row3TitleParent, raiOtherService[i].ParentTitle)
+		} else {
+			row3TitleParent = append(row3TitleParent, raiOtherService[i].Title)
+		}
+	}
+
+	// 设置表头
+	for i := range row3Title {
+		v := titleRow3.AddCell()
+		v.SetString(row3Title[i])
+		v.SetStyle(style)
+	}
+
+	// 此处取第二行标题NameKeyMap, 后面的动态匹配
+	row2NameKeyMap := make(map[string]int)
+	for i := range row3Title {
+		row2NameKeyMap[row3Title[i]] = i
+	}
+
+	for _, v := range list {
+		k := -1 // 套餐匹配用
+		dataRow := sheet.AddRow()
+		dataRow.SetHeight(20)
+		dataRow.AddCell().SetString(v.CompanyName)
+		dataRow.AddCell().SetString(v.StartDate)
+		dataRow.AddCell().SetString(v.EndDate)
+		contractTypeString := ``
+		if v.HasPayment == 1 {
+			//代付
+			if v.ContractType == 1 {
+				contractTypeString = "代付合同（新签）"
+			} else if v.ContractType == 2 {
+				contractTypeString = "代付合同（续约）"
+			} else {
+				contractTypeString = "代付合同（补充）"
+			}
+		} else {
+			if v.ContractType == 1 {
+				contractTypeString = "自付合同（新签）"
+			} else if v.ContractType == 2 {
+				contractTypeString = "自付合同（续约）"
+			} else {
+				contractTypeString = "自付合同（补充）"
+			}
+		}
+		dataRow.AddCell().SetString(contractTypeString)
+		dataRow.AddCell().SetString(v.InvoiceDate)
+		originAmount := fmt.Sprintf("%.2f", v.OriginAmount)
+		dataRow.AddCell().SetString(originAmount)
+		amount := fmt.Sprintf("%.2f", v.Amount)
+		dataRow.AddCell().SetString(amount)
+		dataRow.AddCell().SetString(v.SellerName)
+
+		dataRow.AddCell().SetString(v.ArriveDate)
+		arriveOriginAmount := fmt.Sprintf("%.2f", v.ArriveOriginAmount)
+		dataRow.AddCell().SetString(arriveOriginAmount)
+		arriveAmount := fmt.Sprintf("%.2f", v.ArriveAmount)
+		dataRow.AddCell().SetString(arriveAmount)
+		dataRow.AddCell().SetString(v.SellerName)
+		dataRow.AddCell().SetString("")
+		dataRow.AddCell().SetString("")
+		k += 15
+		svList := serviceMap[v.ContractRegisterId]
+
+		// Ficc大套餐
+		col4Name := row3Title[k]
+		col4 := ""
+		if svList != nil && len(svList) > 0 {
+			for isv := range svList {
+				if svList[isv].Title == col4Name {
+					col4 = "是"
+					break
+				}
+			}
+		}
+		dataRow.AddCell().SetString(col4)
+
+		// 小套餐
+		serviceChartPermissionIds := serviceChartPermissionsMap[v.ContractRegisterId]
+		for i := 0; i < permissionLen; i++ {
+			k += 1
+			colName := row3Title[k]
+			chartPermissionId := permissionNameIdMap[colName]
+			if utils.InArray(chartPermissionId, serviceChartPermissionIds) {
+				dataRow.AddCell().SetString("是")
+			} else {
+				dataRow.AddCell().SetString("")
+			}
+		}
+
+		// 除大小套餐外的其他套餐(处理方式其实跟上面的大套餐一样, 只是中间隔了小套餐按照顺序要这么处理=_=!)
+		for i := 0; i < otherServiceLen; i++ {
+			k += 1
+			otherColName := row3Title[k]
+			otherCol := ""
+			if svList != nil && len(svList) > 0 {
+				for isv := range svList {
+					if svList[isv].Title == otherColName {
+						// 判断权益套餐权限时，需要同时判断父级name
+						if otherColName == "主观" || otherColName == "客观" {
+							if row3TitleParent[k] == svList[isv].ParentTitle {
+								otherCol = "是"
+								break
+							}
+						} else {
+							otherCol = "是"
+							break
+						}
+					}
+				}
+			}
+			dataRow.AddCell().SetString(otherCol)
+		}
+	}
+
+	// 输出文件
+	var buffer bytes.Buffer
+	_ = xlsxFile.Write(&buffer)
+	content := bytes.NewReader(buffer.Bytes())
+	randStr := time.Now().Format(utils.FormatDateTimeUnSpace)
+	fileName := sheetName + randStr + ".xlsx"
+
+	c.Writer.Header().Add("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, fileName))
+	c.Writer.Header().Add("Content-Type", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
+	http.ServeContent(c.Writer, c.Request, fileName, time.Now(), content)
+}

controller/contract/register.go

@@ -3161,7 +3161,7 @@ func (rg *RegisterController) Import(c *gin.Context) {
 						continue
 					}
 					// 权益研选等套餐
-					if k >= 50 && k <= 54 {
+					if k >= 50 && k <= 56 {
 						if v == "是" {
 							tempItem := serviceTempNameMap[titleMap[k]]
 							if tempItem == nil {
@@ -3183,12 +3183,12 @@ func (rg *RegisterController) Import(c *gin.Context) {
 						continue
 					}
 					// 套餐备注
-					if k == 55 {
+					if k == 57 {
 						rowRegister.ServiceRemark = v
 						continue
 					}
 					// 开始时间/到期时间
-					if k == 58 {
+					if k == 60 {
 						// 转换失败可能是因为格式为Excel日期格式, 读取出来会是一串数字, 将其转换成日期字符串再处理
 						va := cell.Value
 						if va == "" {
@@ -3212,7 +3212,7 @@ func (rg *RegisterController) Import(c *gin.Context) {
 						rowRegister.StartDate = startDate
 						continue
 					}
-					if k == 59 {
+					if k == 61 {
 						va := cell.Value
 						if va == "" {
 							resp.Fail(fmt.Sprintf("第%d行到期时间不可为空, 请按模板导入", i+1), c)
@@ -3235,7 +3235,7 @@ func (rg *RegisterController) Import(c *gin.Context) {
 						continue
 					}
 					// 合同金额
-					if k == 60 {
+					if k == 62 {
 						amountStr := v
 						amount, e := strconv.ParseFloat(amountStr, 64)
 						if e != nil {
@@ -3246,7 +3246,7 @@ func (rg *RegisterController) Import(c *gin.Context) {
 						continue
 					}
 					// 金额单位
-					if k == 61 {
+					if k == 63 {
 						rate := rateMap[v]
 						if rate <= 0 {
 							resp.Fail(fmt.Sprintf("第%d行金额单位有误, 请按模板导入", i+1), c)
@@ -3257,7 +3257,7 @@ func (rg *RegisterController) Import(c *gin.Context) {
 						continue
 					}
 					// FICC 套餐总金额
-					if k == 62 {
+					if k == 64 {
 						amountStr := v
 						amount, _ := strconv.ParseFloat(amountStr, 64)
 						if amount > 0 {
@@ -3272,7 +3272,7 @@ func (rg *RegisterController) Import(c *gin.Context) {
 						continue
 					}
 					// 权益套餐总金额
-					if k == 63 {
+					if k == 65 {
 						amountStr := v
 						amount, _ := strconv.ParseFloat(amountStr, 64)
 						if amount > 0 {
@@ -3287,12 +3287,12 @@ func (rg *RegisterController) Import(c *gin.Context) {
 						continue
 					}
 					// 约定付款日期
-					if k == 64 {
+					if k == 66 {
 						rowRegister.AgreedPayTime = v
 						continue
 					}
 					// 签订日
-					if k == 65 {
+					if k == 67 {
 						va := cell.Value
 						if va == "" {
 							continue
@@ -3314,7 +3314,7 @@ func (rg *RegisterController) Import(c *gin.Context) {
 						continue
 					}
 					// 合同状态
-					if k == 66 {
+					if k == 68 {
 						rowRegister.ContractStatus = fms.ContractStatusNameKeyMap[v]
 						if rowRegister.ContractStatus == 0 {
 							resp.Fail(fmt.Sprintf("第%d行合同状态不匹配, 请按模板导入", i+1), c)
@@ -3323,7 +3323,7 @@ func (rg *RegisterController) Import(c *gin.Context) {
 						continue
 					}
 					// 合同编号
-					if k == 67 {
+					if k == 69 {
 						rowContractCode := v
 						if rowContractCode == "" {
 							resp.Fail(fmt.Sprintf("第%d行合同编号不可为空, 请按模板导入", i+1), c)
@@ -3338,12 +3338,12 @@ func (rg *RegisterController) Import(c *gin.Context) {
 						continue
 					}
 					// 合规备注
-					if k == 68 {
+					if k == 70 {
 						rowRegister.Remark = v
 						continue
 					}
 					// 开票列表
-					k2 := 68
+					k2 := 70
 					for ir := 0; ir < invoiceMax; ir++ {
 						n := ir + 1
 						// 开票日

models/fms/contract_invoice.go

@@ -357,19 +357,21 @@ type InvoicePaymentCensusItem struct {
 
 // InvoicePaymentCensusInfo 开票到款统计信息
 type InvoicePaymentCensusInfo struct {
-	InvoiceId         int                                 `json:"invoice_id" description:"开票ID"`
-	InvoiceDate       string                              `json:"invoice_time" description:"开票日期"`
-	InvoiceAmount     float64                             `json:"invoice_amount" description:"开票金额"`
-	SellerId          int                                 `json:"seller_id" description:"销售ID"`
-	SellerName        string                              `json:"seller_name" description:"销售名称"`
-	SellerGroupId     int                                 `json:"seller_group_id" description:"销售组别ID"`
-	SellerGroupName   string                              `json:"seller_group_name" description:"销售组别名称"`
-	PaymentId         int                                 `json:"payment_id" description:"到款ID"`
-	PaymentDate       string                              `json:"payment_date" description:"到款日期"`
-	PaymentAmount     float64                             `json:"payment_amount" description:"到款金额"`
-	PayType           int                                 `json:"pay_type" description:"付款方式：0-无；1-年付；2-半年付；3-季付；4-次付；5-异常"`
-	ServiceAmountList []*ContractPaymentServiceAmountItem `json:"service_amount_list" description:"到款套餐金额分配信息"`
-	SellerType        string                              `json:"seller_type" description:"销售类型：1ficc销售，2权益销售"`
+	InvoiceId           int                                 `json:"invoice_id" description:"开票ID"`
+	InvoiceDate         string                              `json:"invoice_time" description:"开票日期"`
+	InvoiceAmount       float64                             `json:"invoice_amount" description:"开票换算金额"`
+	InvoiceOriginAmount float64                             `json:"invoice_origin_amount" description:"开票原始金额"`
+	SellerId            int                                 `json:"seller_id" description:"销售ID"`
+	SellerName          string                              `json:"seller_name" description:"销售名称"`
+	SellerGroupId       int                                 `json:"seller_group_id" description:"销售组别ID"`
+	SellerGroupName     string                              `json:"seller_group_name" description:"销售组别名称"`
+	PaymentId           int                                 `json:"payment_id" description:"到款ID"`
+	PaymentDate         string                              `json:"payment_date" description:"到款日期"`
+	PaymentAmount       float64                             `json:"payment_amount" description:"到款换算金额"`
+	PaymentOriginAmount float64                             `json:"payment_origin_amount" description:"到款原始金额"`
+	PayType             int                                 `json:"pay_type" description:"付款方式：0-无；1-年付；2-半年付；3-季付；4-次付；5-异常"`
+	ServiceAmountList   []*ContractPaymentServiceAmountItem `json:"service_amount_list" description:"到款套餐金额分配信息"`
+	SellerType          string                              `json:"seller_type" description:"销售类型：1ficc销售，2权益销售"`
 }
 
 // ContractInvoiceAmountTotal 开票到款金额合计信息
@@ -529,7 +531,8 @@ func GetInvoiceListCurrencySum(condition string, pars []interface{}, groupRule s
 
 // PreRegisterListReq 预登记列表请求体
 type PreRegisterListReq struct {
-	Keyword string `json:"keyword" form:"keyword" binding:"omitempty" description:"关键词"`
+	Keyword  string `json:"keyword" form:"keyword" binding:"omitempty" description:"关键词"`
+	IsExport int    `json:"is_export" form:"is_export" description:"是否导出: 0-否; 1-是"`
 	base.PageReq
 }
 
@@ -709,22 +712,25 @@ type NotPaymentCensusItem struct {
 
 // NotPaymentCensusInfo 开票到款统计信息
 type NotPaymentCensusInfo struct {
-	InvoiceId         int                                 `json:"invoice_id" description:"开票ID"`
-	InvoiceDate       string                              `json:"invoice_time" description:"开票日期"`
-	InvoiceAmount     float64                             `json:"invoice_amount" description:"开票金额"`
-	SellerId          int                                 `json:"seller_id" description:"销售ID"`
-	SellerName        string                              `json:"seller_name" description:"销售名称"`
-	SellerGroupId     int                                 `json:"seller_group_id" description:"销售组别ID"`
-	SellerGroupName   string                              `json:"seller_group_name" description:"销售组别名称"`
-	PaymentId         int                                 `json:"payment_id" description:"到款ID"`
-	PaymentDate       string                              `json:"payment_date" description:"到款日期"`
-	PaymentAmount     float64                             `json:"payment_amount" description:"到款金额"`
-	PayType           int                                 `json:"pay_type" description:"付款方式：0-无；1-年付；2-半年付；3-季付；4-次付；5-异常"`
-	ServiceAmountList []*ContractPaymentServiceAmountItem `json:"service_amount_list" description:"到款套餐金额分配信息"`
-	SellerType        int                                 `json:"seller_type" description:"销售类型：1ficc销售，2权益销售"`
-	NotPaymentAmount  float64                             `json:"not_payment_amount" description:"开票未到款金额"`
-	ServiceProductId  int                                 `json:"service_product_id" description:"套餐类型：1ficc套餐，2权益套餐"`
-	UnitName          string                              `json:"unit_name" description:"单位名称"`
+	InvoiceId              int                                 `json:"invoice_id" description:"开票ID"`
+	InvoiceDate            string                              `json:"invoice_time" description:"开票日期"`
+	InvoiceAmount          float64                             `json:"invoice_amount" description:"开票换算金额"`
+	InvoiceOriginAmount    float64                             `json:"invoice_origin_amount" description:"开票原始金额"`
+	SellerId               int                                 `json:"seller_id" description:"销售ID"`
+	SellerName             string                              `json:"seller_name" description:"销售名称"`
+	SellerGroupId          int                                 `json:"seller_group_id" description:"销售组别ID"`
+	SellerGroupName        string                              `json:"seller_group_name" description:"销售组别名称"`
+	PaymentId              int                                 `json:"payment_id" description:"到款ID"`
+	PaymentDate            string                              `json:"payment_date" description:"到款日期"`
+	PaymentAmount          float64                             `json:"payment_amount" description:"到款换算金额"`
+	PaymentOriginAmount    float64                             `json:"payment_origin_amount" description:"到款原始金额"`
+	PayType                int                                 `json:"pay_type" description:"付款方式：0-无；1-年付；2-半年付；3-季付；4-次付；5-异常"`
+	ServiceAmountList      []*ContractPaymentServiceAmountItem `json:"service_amount_list" description:"到款套餐金额分配信息"`
+	SellerType             int                                 `json:"seller_type" description:"销售类型：1ficc销售，2权益销售"`
+	NotPaymentOriginAmount float64                             `json:"not_payment_origin_amount" description:"开票未到款金额"`
+	NotPaymentAmount       float64                             `json:"not_payment_amount" description:"开票未到款换算金额"`
+	ServiceProductId       int                                 `json:"service_product_id" description:"套餐类型：1ficc套餐，2权益套餐"`
+	UnitName               string                              `json:"unit_name" description:"单位名称"`
 }
 
 // GetCensusSellerGroupInvoicePageListV2 获取销售组开票统计列表-分页

models/fms/invoice_payment_summary.go

@@ -74,36 +74,38 @@ func GetInvoicePaymentCensusPageList(page base.IPage, condition string, pars []i
 }
 
 type InvoicePaymentSummaryItem struct {
-	SummaryId        int       `json:"summary_id" description:"汇总ID"`
-	RegisterId       int       `json:"register_id" description:"登记ID"`
-	CompanyName      string    `json:"company_name" description:"客户名称"`
-	NewCompany       int       `json:"new_company" description:"是否为新客户: 0-否; 1-是"`
-	StartDate        time.Time `json:"start_date" description:"合同开始日期"`
-	EndDate          time.Time `json:"end_date" description:"合同结束日期"`
-	InvoiceId        int       `json:"invoice_id" description:"开票ID"`
-	InvoiceDate      time.Time `json:"invoice_time" description:"开票日期"`
-	InvoiceAmount    float64   `json:"invoice_amount" description:"开票金额"`
-	SellerId         int       `json:"seller_id" description:"销售ID"`
-	SellerName       string    `json:"seller_name" description:"销售名称"`
-	SellerGroupId    int       `json:"seller_group_id" description:"销售组别ID"`
-	SellerGroupName  string    `json:"seller_group_name" description:"销售组别名称"`
-	PaymentId        int       `json:"payment_id" description:"到款ID"`
-	PaymentDate      time.Time `json:"payment_date" description:"到款日期"`
-	PaymentAmount    float64   `json:"payment_amount" description:"到款金额"`
-	PayType          int       `json:"pay_type" description:"付款方式：0-无；1-年付；2-半年付；3-季付；4-次付；5-异常"`
-	ServiceProductId int       `json:"service_product_id" description:"套餐类型：1ficc套餐，2权益套餐"`
-	ContractAmount   float64   `gorm:"column:contract_amount" json:"contract_amount" description:"合同金额"`
-	InvoicedAmount   float64   `gorm:"column:invoiced_amount" json:"invoiced_amount" description:"开票金额"`
-	CurrencyUnit     string    `gorm:"column:currency_unit" json:"currency_unit" description:"货币国际代码"`
-	RMBRate          float64   `gorm:"column:rmb_rate" json:"rmb_rate" description:"人民币汇率(create_time当日)"`
-	UnitName         string    `json:"unit_name" description:"单位名称"`
+	SummaryId           int       `json:"summary_id" description:"汇总ID"`
+	RegisterId          int       `json:"register_id" description:"登记ID"`
+	CompanyName         string    `json:"company_name" description:"客户名称"`
+	NewCompany          int       `json:"new_company" description:"是否为新客户: 0-否; 1-是"`
+	StartDate           time.Time `json:"start_date" description:"合同开始日期"`
+	EndDate             time.Time `json:"end_date" description:"合同结束日期"`
+	InvoiceId           int       `json:"invoice_id" description:"开票ID"`
+	InvoiceDate         time.Time `json:"invoice_time" description:"开票日期"`
+	InvoiceOriginAmount float64   `json:"invoice_origin_amount" description:"开票原始金额"`
+	InvoiceAmount       float64   `json:"invoice_amount" description:"开票换算金额"`
+	SellerId            int       `json:"seller_id" description:"销售ID"`
+	SellerName          string    `json:"seller_name" description:"销售名称"`
+	SellerGroupId       int       `json:"seller_group_id" description:"销售组别ID"`
+	SellerGroupName     string    `json:"seller_group_name" description:"销售组别名称"`
+	PaymentId           int       `json:"payment_id" description:"到款ID"`
+	PaymentDate         time.Time `json:"payment_date" description:"到款日期"`
+	PaymentOriginAmount float64   `json:"payment_origin_amount" description:"到款原始金额"`
+	PaymentAmount       float64   `json:"payment_amount" description:"到款换算金额"`
+	PayType             int       `json:"pay_type" description:"付款方式：0-无；1-年付；2-半年付；3-季付；4-次付；5-异常"`
+	ServiceProductId    int       `json:"service_product_id" description:"套餐类型：1ficc套餐，2权益套餐"`
+	ContractAmount      float64   `gorm:"column:contract_amount" json:"contract_amount" description:"合同金额"`
+	InvoicedAmount      float64   `gorm:"column:invoiced_amount" json:"invoiced_amount" description:"开票金额"`
+	CurrencyUnit        string    `gorm:"column:currency_unit" json:"currency_unit" description:"货币国际代码"`
+	RMBRate             float64   `gorm:"column:rmb_rate" json:"rmb_rate" description:"人民币汇率(create_time当日)"`
+	UnitName            string    `json:"unit_name" description:"单位名称"`
 }
 
 // GetInvoicePaymentCensusSummaryData 获取商品到款统计列表-汇总数据
 func GetInvoicePaymentCensusSummaryData(condition string, pars []interface{}) (results []*InvoicePaymentSummaryItem, err error) {
 	fields := []string{"a.id AS summary_id", "a.register_id", "a.invoice_id", "a.payment_id", "a.service_product_id", "b.company_name", "b.start_date", "b.end_date",
-		"c.origin_amount AS invoice_amount", "c.invoice_time AS invoice_date", "IF(c.seller_id > 0, c.seller_id, d.seller_id) AS seller_id", "IF(c.seller_name = '' OR c.seller_name IS NULL, d.seller_name, c.seller_name) AS seller_name", "IF(c.seller_group_id > 0,c.seller_group_id,d.seller_group_id) AS seller_group_id",
-		"IF(c.seller_group_name = '' OR c.seller_group_name IS NULL, d.seller_group_name, c.seller_group_name) AS seller_group_name", "d.origin_amount AS payment_amount", "d.invoice_time AS payment_date", "d.pay_type", "b.currency_unit",
+		"c.origin_amount AS invoice_origin_amount", "c.amount AS invoice_amount", "c.invoice_time AS invoice_date", "IF(c.seller_id > 0, c.seller_id, d.seller_id) AS seller_id", "IF(c.seller_name = '' OR c.seller_name IS NULL, d.seller_name, c.seller_name) AS seller_name", "IF(c.seller_group_id > 0,c.seller_group_id,d.seller_group_id) AS seller_group_id",
+		"IF(c.seller_group_name = '' OR c.seller_group_name IS NULL, d.seller_group_name, c.seller_group_name) AS seller_group_name", "d.amount AS payment_amount", "d.origin_amount AS payment_origin_amount", "d.invoice_time AS payment_date", "d.pay_type", "b.currency_unit",
 	}
 	query := global.DEFAULT_MYSQL.Table("invoice_payment_summary AS a").
 		Select(strings.Join(fields, ",")).
@@ -206,7 +208,7 @@ type IncomeSummaryItem struct {
 func GetContractSummaryIncomeAmount(condition string, pars []interface{}) (results []*IncomeSummaryItem, err error) {
 	query := global.DEFAULT_MYSQL.Table("invoice_payment_summary AS a").
 		Select("IF(a.invoice_id=0,d.amount, b.amount) AS amount,IF(a.invoice_id=0,d.invoice_time, b.invoice_time) AS invoice_date,"+
-			" c.contract_type,c.company_name," +
+			" c.contract_type,c.company_name,"+
 			"IF(a.invoice_id=0,d.seller_name, b.seller_name) AS seller_name,"+
 			"IF(a.invoice_id=0,d.seller_id, b.seller_id) AS final_seller_id,"+
 			"IF(a.invoice_id=0,d.seller_group_id, b.seller_group_id) AS seller_group_id").
@@ -304,29 +306,32 @@ func (c IncomeSummaryItemList) Swap(i, j int) {
 }
 
 type NotInvoicePaymentSummaryItem struct {
-	SummaryId              int       `json:"summary_id" description:"汇总ID"`
-	RegisterId             int       `json:"register_id" description:"登记ID"`
-	NewCompany             int       `json:"new_company" description:"是否为新客户: 0-否; 1-是"`
-	InvoiceId              int       `json:"invoice_id" description:"开票ID"`
-	InvoiceDate            time.Time `json:"invoice_time" description:"开票日期"`
-	InvoiceAmount          float64   `json:"invoice_amount" description:"开票金额"`
-	SellerGroupId          int       `json:"seller_group_id" description:"销售组别ID"`
-	SellerGroupName        string    `json:"seller_group_name" description:"销售组别名称"`
-	RaiSellerGroupId       int       `json:"rai_seller_group_id" description:"销售组别ID"`
-	RaiSellerGroupName     string    `json:"rai_seller_group_name" description:"销售组别名称"`
-	PaymentId              int       `json:"payment_id" description:"到款ID"`
-	PaymentDate            time.Time `json:"payment_date" description:"到款日期"`
-	PaymentAmount          float64   `json:"payment_amount" description:"到款金额"`
-	PayType                int       `json:"pay_type" description:"付款方式：0-无；1-年付；2-半年付；3-季付；4-次付；5-异常"`
-	ServiceProductId       int       `json:"service_product_id" description:"套餐类型：1ficc套餐，2权益套餐"`
-	ContractAmount         float64   `gorm:"column:contract_amount" json:"contract_amount" description:"合同金额"`
-	InvoicedAmount         float64   `gorm:"column:invoiced_amount" json:"invoiced_amount" description:"开票金额"`
-	CurrencyUnit           string    `gorm:"column:currency_unit" json:"currency_unit" description:"货币国际代码"`
-	RMBRate                float64   `gorm:"column:rmb_rate" json:"rmb_rate" description:"人民币汇率(create_time当日)"`
-	PaymentAmountTotal     float64   `gorm:"column:payment_amount_total" json:"payment_amount_total" description:"合同金额"`
-	InvoiceAmountTotal     float64   `gorm:"column:invoice_amount_total" json:"invoice_amount_total" description:"开票金额"`
-	NotInvoicedAmountTotal float64   ` json:"not_invoiced_amount_total" description:"未开票金额"`
-	SellerType             string    `json:"seller_type" description:"销售类型"`
+	SummaryId                    int       `json:"summary_id" description:"汇总ID"`
+	RegisterId                   int       `json:"register_id" description:"登记ID"`
+	NewCompany                   int       `json:"new_company" description:"是否为新客户: 0-否; 1-是"`
+	InvoiceId                    int       `json:"invoice_id" description:"开票ID"`
+	InvoiceDate                  time.Time `json:"invoice_time" description:"开票日期"`
+	InvoiceAmount                float64   `json:"invoice_amount" description:"开票金额"`
+	InvoiceOriginAmount          float64   `json:"invoice_origin_amount" description:"开票原始金额"`
+	SellerGroupId                int       `json:"seller_group_id" description:"销售组别ID"`
+	SellerGroupName              string    `json:"seller_group_name" description:"销售组别名称"`
+	RaiSellerGroupId             int       `json:"rai_seller_group_id" description:"销售组别ID"`
+	RaiSellerGroupName           string    `json:"rai_seller_group_name" description:"销售组别名称"`
+	PaymentId                    int       `json:"payment_id" description:"到款ID"`
+	PaymentDate                  time.Time `json:"payment_date" description:"到款日期"`
+	PaymentAmount                float64   `json:"payment_amount" description:"到款金额"`
+	PaymentOriginAmount          float64   `json:"payment_origin_amount" description:"到款原始金额"`
+	PayType                      int       `json:"pay_type" description:"付款方式：0-无；1-年付；2-半年付；3-季付；4-次付；5-异常"`
+	ServiceProductId             int       `json:"service_product_id" description:"套餐类型：1ficc套餐，2权益套餐"`
+	ContractAmount               float64   `gorm:"column:contract_amount" json:"contract_amount" description:"合同金额"`
+	InvoicedAmount               float64   `gorm:"column:invoiced_amount" json:"invoiced_amount" description:"开票金额"`
+	CurrencyUnit                 string    `gorm:"column:currency_unit" json:"currency_unit" description:"货币国际代码"`
+	RMBRate                      float64   `gorm:"column:rmb_rate" json:"rmb_rate" description:"人民币汇率(create_time当日)"`
+	PaymentAmountTotal           float64   `gorm:"column:payment_amount_total" json:"payment_amount_total" description:"合同金额"`
+	InvoiceAmountTotal           float64   `gorm:"column:invoice_amount_total" json:"invoice_amount_total" description:"开票金额"`
+	NotInvoicedAmountOriginTotal float64   ` json:"not_invoiced_amount_origin_total" description:"未开票金额"`
+	NotInvoicedAmountTotal       float64   ` json:"not_invoiced_amount_total" description:"未开票转换金额"`
+	SellerType                   string    `json:"seller_type" description:"销售类型"`
 	ContractRegister
 }