Merge branch 'master' into fms_2.6

# Conflicts:
#	controller/census/invoice_payment.go
#	models/fms/invoice_payment_summary.go
#	routers/census.go

.gitignore

@@ -8,3 +8,4 @@ go.sum
 latest_binlog
 /rdlucklog
 /*.exe
+/fms_api

config/config.go

@@ -8,11 +8,14 @@ import (
 	"github.com/tealeg/xlsx"
 	"hongze/fms_api/controller/resp"
 	"hongze/fms_api/global"
+	"hongze/fms_api/models"
 	"hongze/fms_api/models/base"
 	"hongze/fms_api/models/fms"
+	"hongze/fms_api/services/alarm_msg"
 	fmsService "hongze/fms_api/services/fms"
 	"hongze/fms_api/utils"
 	"net/http"
+	"sort"
 	"strconv"
 	"strings"
 	"sync"
@@ -337,7 +340,7 @@ func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentC
 		return
 	}
 	serviceTempListMap := make(map[int]*fms.ContractServiceTemplate)
-	var serviceTempShow [] *fms.ContractServiceTemplate
+	var serviceTempShow []*fms.ContractServiceTemplate
 	for i := range serviceTempList {
 		serviceTempListMap[serviceTempList[i].ServiceTemplateId] = serviceTempList[i]
 	}
@@ -345,17 +348,17 @@ func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentC
 		if serviceTempList[i].ProductId == 1 {
 			rowTitle = append(rowTitle, serviceTempList[i].Title)
 			serviceTempShow = append(serviceTempShow, serviceTempList[i])
-		}else if serviceTempList[i].ProductId == 2{
-			if serviceTempList[i].Title == "行业套餐" || serviceTempList[i].Title == "权益大套餐" || (serviceTempList[i].Title == "策略" && serviceTempListMap[serviceTempList[i].Pid].Pid==0){
-			}else if serviceTempList[i].Title == "医药" || serviceTempList[i].Title == "消费" || serviceTempList[i].Title == "科技" || serviceTempList[i].Title == "智造" {
-			}else {
+		} else if serviceTempList[i].ProductId == 2 {
+			if serviceTempList[i].Title == "行业套餐" || serviceTempList[i].Title == "权益大套餐" || (serviceTempList[i].Title == "策略" && serviceTempListMap[serviceTempList[i].Pid].Pid == 0) {
+			} else if serviceTempList[i].Title == "医药" || serviceTempList[i].Title == "消费" || serviceTempList[i].Title == "科技" || serviceTempList[i].Title == "智造" {
+			} else {
 				serviceTempShow = append(serviceTempShow, serviceTempList[i])
 			}
-			if serviceTempList[i].Title == "行业套餐" || serviceTempList[i].Title == "45万" ||  serviceTempList[i].Title == "70万" {
+			if serviceTempList[i].Title == "行业套餐" || serviceTempList[i].Title == "45万" || serviceTempList[i].Title == "70万" {
 				continue
 			}
 
-			if serviceTempList[i].Pid > 0 &&  serviceTempListMap[serviceTempList[i].Pid].Pid > 0 {
+			if serviceTempList[i].Pid > 0 && serviceTempListMap[serviceTempList[i].Pid].Pid > 0 {
 				continue
 			}
 
@@ -372,8 +375,8 @@ func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentC
 		v.SetStyle(style)
 		if rowTitle[i] != "权益大套餐" && rowTitle[i] != "医药" && rowTitle[i] != "消费" && rowTitle[i] != "科技" && rowTitle[i] != "智造" {
 			v.VMerge = 1
-			hi ++
-		}else{
+			hi++
+		} else {
 			if insertHi == 0 {
 				insertHi = hi
 			}
@@ -384,7 +387,7 @@ func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentC
 
 	// 新增一行放主观和客观
 	specialRow := sheet.AddRow()
-	for i:=0; i< hi; i++ {
+	for i := 0; i < hi; i++ {
 		if i == insertHi {
 			v1 := specialRow.AddCell()
 			v1.SetString("45万")
@@ -392,25 +395,25 @@ func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentC
 			v1 = specialRow.AddCell()
 			v1.SetString("70万")
 			v1.SetStyle(style)
-			for j:=0; j<8;j++ {
-				if j%2 ==0 {
+			for j := 0; j < 8; j++ {
+				if j%2 == 0 {
 					v1 = specialRow.AddCell()
 					v1.SetString("主观")
 					v1.SetStyle(style)
-				}else{
+				} else {
 					v1 = specialRow.AddCell()
 					v1.SetString("客观")
 					v1.SetStyle(style)
 				}
 			}
-		}else{
+		} else {
 			v := specialRow.AddCell()
 			v.SetString("")
 		}
 	}
 
-	newCompanyMap := map[int]string{0: "否", 1: "是"}
-	sellerTypeMap := map[int]string{1:"FICC销售", 2:"权益销售"}
+	newCompanyMap := map[int]string{0: "/", 1: "是" , 2: "否"}
+	sellerTypeMap := map[int]string{1: "FICC销售", 2: "权益销售"}
 	for k, v := range list {
 		dataRow := sheet.AddRow()
 		// 前四个单元格根据每行开票到款条数向下合并
@@ -428,7 +431,7 @@ func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentC
 		// 是否新客户
 		colC := dataRow.AddCell()
 		colC.VMerge = mergeRowNum
-		colC.SetString(newCompanyMap[v.NewCompany])
+		colC.SetString(newCompanyMap[v.ContractType])
 		// 合同有效期
 		colD := dataRow.AddCell()
 		colD.VMerge = mergeRowNum
@@ -453,15 +456,15 @@ func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentC
 					if item.ServiceTemplateId == serviceTempShow[i].ServiceTemplateId {
 						serviceTempShowAmount[serviceTempShow[i].ServiceTemplateId] = fmt.Sprint(item.Amount)
 						break
-					}else if serviceTempShow[i].Pid == item.ServiceTemplateId {
-						serviceTempShowAmount[serviceTempShow[i].ServiceTemplateId] = fmt.Sprint(item.Amount/2)
+					} else if serviceTempShow[i].Pid == item.ServiceTemplateId {
+						serviceTempShowAmount[serviceTempShow[i].ServiceTemplateId] = fmt.Sprint(item.Amount / 2)
 						break
 					}
 				}
 			}
 			for i := range serviceTempShow {
 				sa := ""
-				if am, ok :=  serviceTempShowAmount[serviceTempShow[i].ServiceTemplateId]; ok {
+				if am, ok := serviceTempShowAmount[serviceTempShow[i].ServiceTemplateId]; ok {
 					sa = am
 				}
 				rowData = append(rowData, sa)
@@ -535,8 +538,8 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 	}
 	if req.SellerIds != "" {
 		sellerIds := strings.Split(req.SellerIds, ",")
-		cond += ` AND (c.seller_id in ?)`
-		pars = append(pars, sellerIds)
+		cond += ` AND (c.seller_id in ? OR d.seller_id in ?)`
+		pars = append(pars, sellerIds, sellerIds)
 	}
 	// 套餐筛选
 	if req.ServiceTypes != "" {
@@ -554,25 +557,25 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 		}
 	}
 
-	if req.ListParam == 1{
+	if req.ListParam == 1 {
 		cond += ` AND a.service_product_id = 1 `
-	}else if req.ListParam == 2 {
+	} else if req.ListParam == 2 {
 		cond += ` AND a.service_product_id = 2 `
 	}
 
 	// 开票到款日期
 	if req.TimeType != 0 {
-		if req.TimeType == 1 &&  req.StartDate != "" && req.EndDate != "" {
+		if req.TimeType == 1 && req.StartDate != "" && req.EndDate != "" {
 			st := fmt.Sprint(req.StartDate, " 00:00:00")
 			ed := fmt.Sprint(req.EndDate, " 23:59:59")
 			cond += ` AND (c.invoice_time BETWEEN ? AND ?) `
 			pars = append(pars, st, ed)
-		}else if req.TimeType == 2 &&  req.StartDate != "" && req.EndDate != "" {
+		} else if req.TimeType == 2 && req.StartDate != "" && req.EndDate != "" {
 			st := fmt.Sprint(req.StartDate, " 00:00:00")
 			ed := fmt.Sprint(req.EndDate, " 23:59:59")
 			cond += ` AND (d.invoice_time BETWEEN ? AND ?) `
 			pars = append(pars, st, ed)
-		}else if req.TimeType == 3 &&  req.StartDate != "" && req.EndDate != "" {
+		} else if req.TimeType == 3 && req.StartDate != "" && req.EndDate != "" {
 			st := fmt.Sprint(req.StartDate, " 00:00:00")
 			ed := fmt.Sprint(req.EndDate, " 23:59:59")
 			cond += ` AND (c.invoice_time BETWEEN ? AND ?) AND (d.invoice_time BETWEEN ? AND ?) `
@@ -581,25 +584,32 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 	} else if req.StartDate != "" && req.EndDate != "" {
 		st := fmt.Sprint(req.StartDate, " 00:00:00")
 		ed := fmt.Sprint(req.EndDate, " 23:59:59")
-		cond += ` AND ((c.invoice_time BETWEEN ? AND ?) or (d.invoice_time BETWEEN ? AND ?))`
-		pars = append(pars, st, ed, st, ed)
+		if req.SellerIds != "" {
+			sellerIds := strings.Split(req.SellerIds, ",")
+			cond += ` AND (c.seller_id in ? OR d.seller_id in ?)`
+			pars = append(pars, sellerIds, sellerIds)
+			cond += ` AND ((c.seller_id in ? AND a.invoice_id <> 0 AND c.invoice_time BETWEEN ? AND ?)`
+			cond += `OR (d.seller_id in ? AND a.payment_id <> 0 AND a.invoice_id = 0 AND d.invoice_time BETWEEN ? AND ?))`
+			pars = append(pars, sellerIds, st, ed, sellerIds, st, ed)
+		} else {
+			cond += ` AND ((a.invoice_id <> 0 AND c.invoice_time BETWEEN ? AND ?)`
+			cond += `OR (a.payment_id <> 0 AND a.invoice_id = 0 AND d.invoice_time BETWEEN ? AND ?))`
+			pars = append(pars, st, ed, st, ed)
+		}
 	}
 
-
 	if req.HasInvoice == "1" {
 		cond += ` AND a.invoice_id > 0 `
-	}else if req.HasInvoice == "0" {
+	} else if req.HasInvoice == "0" {
 		cond += ` AND a.invoice_id = 0 `
 	}
 
 	if req.HasPayment == "1" {
 		cond += ` AND a.payment_id > 0 `
-	}else if req.HasPayment == "0" {
+	} else if req.HasPayment == "0" {
 		cond += ` AND a.payment_id = 0 `
 	}
 
-
-
 	page := new(base.Page)
 	page.SetPageSize(req.PageSize)
 	page.SetCurrent(req.Current)
@@ -612,41 +622,40 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 		return
 	}
 	if req.SortParam == "" {
-			page.AddOrderItem(base.OrderItem{Column: "sort_invoice_id", Asc: true})
-			page.AddOrderItem(base.OrderItem{Column: "sort_payment_id", Asc: false})
-			page.AddOrderItem(base.OrderItem{Column: "c.invoice_time", Asc: false})
-			page.AddOrderItem(base.OrderItem{Column: "c.amount", Asc: false})
-			page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: false})
-	}else if req.SortParam == "invoice_time" {
+		page.AddOrderItem(base.OrderItem{Column: "sort_invoice_id", Asc: true})
+		page.AddOrderItem(base.OrderItem{Column: "sort_payment_id", Asc: false})
+		page.AddOrderItem(base.OrderItem{Column: "c.invoice_time", Asc: false})
+		page.AddOrderItem(base.OrderItem{Column: "c.amount", Asc: false})
+		page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: false})
+	} else if req.SortParam == "invoice_time" {
 		if req.SortType == "asc" {
 			page.AddOrderItem(base.OrderItem{Column: "sort_invoice_id", Asc: false})
 			page.AddOrderItem(base.OrderItem{Column: "c.invoice_time", Asc: true})
 			page.AddOrderItem(base.OrderItem{Column: "c.amount", Asc: true})
 			page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: true})
-		}else{
+		} else {
 			page.AddOrderItem(base.OrderItem{Column: "sort_invoice_id", Asc: true})
 			page.AddOrderItem(base.OrderItem{Column: "c.invoice_time", Asc: false})
 			page.AddOrderItem(base.OrderItem{Column: "c.amount", Asc: false})
 			page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: false})
 		}
-	}else if req.SortParam == "payment_date" {
+	} else if req.SortParam == "payment_date" {
 		if req.SortType == "asc" {
 			page.AddOrderItem(base.OrderItem{Column: "sort_payment_id", Asc: false})
 			page.AddOrderItem(base.OrderItem{Column: "d.invoice_time", Asc: true})
 			page.AddOrderItem(base.OrderItem{Column: "d.amount", Asc: true})
 			page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: true})
-		}else{
+		} else {
 			page.AddOrderItem(base.OrderItem{Column: "sort_payment_id", Asc: true})
 			page.AddOrderItem(base.OrderItem{Column: "d.invoice_time", Asc: false})
 			page.AddOrderItem(base.OrderItem{Column: "d.amount", Asc: false})
 			page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: false})
 		}
-	}else{
+	} else {
 		resp.Fail("排序字段不正确", c)
 		return
 	}
 
-
 	if req.IsExport == 1 {
 		page.SetPageSize(10000)
 		page.SetCurrent(1)
@@ -724,7 +733,7 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 				contractServiceMap[contractServiceList[i].ContractRegisterId] = append(contractServiceMap[contractServiceList[i].ContractRegisterId], contractServiceList[i])
 				servicesNameMap[contractServiceList[i].ContractRegisterId] = append(servicesNameMap[contractServiceList[i].ContractRegisterId], contractServiceList[i].Title)
 			}
-*/
+			*/
 			servicesNameMap, serviceFormatMap, e := fmsService.GetContractServiceNameFormat(queryRegisterIds)
 			if e != nil {
 				listErr = fmt.Errorf("获取合同套餐列表失败, Err: %s", e.Error())
@@ -784,6 +793,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 {
@@ -811,12 +821,13 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 				v.ServicesName = servicesNameMap[registerList[i].ContractRegisterId]
 				v.InvoicePaymentList = summaryMap[registerList[i].SummaryId]
 				v.ContractType = registerList[i].ContractType
+				v.ActualPayCompanies = registerList[i].ActualPayCompanies
 				respList = append(respList, v)
 			}
 		}()
 
 		// 开票到款金额合计(换算后)
-		var invoiceTotal, paymentTotal float64
+		var invoiceTotal, paymentTotal, amountTotal float64
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
@@ -839,6 +850,16 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 				return
 			}
 			paymentTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", paymentSum), 64)
+
+			amountCond := `a.id IN ? AND (a.invoice_id <> 0 OR (a.payment_id <> 0 AND a.invoice_id =0))`
+			amountPars := make([]interface{}, 0)
+			amountPars = append(amountPars, summaryIds)
+			amountSum, e := fms.GetContractSummaryInvoicePaymentAmount(amountCond, amountPars)
+			if e != nil {
+				totalErr = fmt.Errorf("获取汇总金额合计失败, Err: %s", e.Error())
+				return
+			}
+			amountTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", amountSum), 64)
 		}()
 
 		// 分币种金额统计
@@ -927,6 +948,7 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 		results.DataList = respList
 		results.InvoiceTotal = invoiceTotal
 		results.PaymentTotal = paymentTotal
+		results.AmountTotal = amountTotal
 		results.InvoiceCurrencyTotal = invoiceCurrencyTotals
 		results.PaymentCurrencyTotal = paymentCurrencyTotals
 	}
@@ -943,7 +965,6 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 	resp.OkData("获取成功", baseData, c)
 }
 
-
 // List
 // @Title 未开票统计列表
 // @Description 未开票统计列表
@@ -2306,4 +2327,554 @@ func ExportNotPaymentCensusList(c *gin.Context, results *fms.NotInvoicePaymentCe
 	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)
-}
+}
+
+// IncomeList
+// @Title 业务收入统计表
+// @Description 获取业务收入统计表接口
+// @Param   ListParam		query	int		false	"套餐类型: 0-月度; 1-季度; 2-半年度；3-年度；4-月度累计"
+// @Success 200 {object} fms.CensusIncomeChartResp
+// @router /census/income/list [get]
+func (this *InvoicePaymentController) IncomeList(c *gin.Context) {
+	var req fms.IncomeListReq
+	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
+	}
+	//收入统计
+	var incomeList models.CensusIncomeChartResp
+	ch := make(chan models.CensusIncomeChartResp, 1)
+	go getCensusIncomeListV2(ch, req)
+
+	for v := range ch {
+		incomeList = v
+		close(ch)
+	}
+	// 是否导出
+	if req.IsExport == 1 {
+		ExportIncomeList(c, incomeList.DataList)
+		return
+	}
+	resp.OkData("获取成功", incomeList, c)
+}
+
+func getCensusIncomeListV2(ch chan models.CensusIncomeChartResp, req fms.IncomeListReq) (incomeChart models.CensusIncomeChartResp, err error) {
+	defer func() {
+		if err != nil {
+			global.LOG.Error(err)
+			if err != utils.ErrNoRow{
+				go alarm_msg.SendAlarmMsg("获取业务收入金额统计数据异常，Err："+err.Error(), 3)
+			}
+		}
+		ch <- incomeChart
+	}()
+	//todayStr := utils.GetToday("20060102")
+	//key := "admin:home:fmsIncomeList:" + todayStr
+	//
+	//redisJsonData, redisErr := global.Redis.Get(context.TODO(), key).Result()
+	//if redisErr != nil {
+
+	//获取最新的开票到款日期
+	cond := ``
+	historyCond := ``
+	pars := make([]interface{}, 0)
+	historyPars := make([]interface{}, 0)
+
+	if req.SellerIds != "" {
+		sellerIds := strings.Split(req.SellerIds, ",")
+		cond += ` AND (a.seller_id in ? )`
+		historyCond += ` AND (seller_id in ? )`
+		pars = append(pars, sellerIds)
+		historyPars = append(historyPars, sellerIds)
+	}
+	if req.CompanyType == 1 {
+		cond += ` AND b.contract_type = 1 `
+		historyCond += ` AND new_company = 1`
+	} else if req.CompanyType == 2 {
+		cond += ` AND b.contract_type IN (2,3,4) `
+		historyCond += ` AND new_company = 0`
+	}
+
+	var latestTime time.Time
+
+	invoiceItem, err := fms.GetLatestIncome(cond, pars)
+	if err != nil && err != utils.ErrNoRow {
+		err = fmt.Errorf("获取最新的开票或到款日期, Err: %s", err.Error())
+		return
+	}
+	latestTime = invoiceItem.InvoiceDate
+
+	if err == utils.ErrNoRow {
+		historyItem, e := fms.GetLatestHistoryIncome(historyCond, historyPars)
+		if e != nil && e != utils.ErrNoRow {
+			err = fmt.Errorf("获取最新的历史开票或到款日期, Err: %s", err.Error())
+			return
+		}
+		latestTime = historyItem.InvoiceDate
+	}
+
+	if latestTime.IsZero() {
+		latestTime = time.Now()
+	}
+	
+	latestTime = latestTime.AddDate(0, 0, -latestTime.Day()+1)
+
+	var dateSlice []string
+	var totalMoneySlice, prevTotalMoneySlice []float64
+	var yoySlice []string
+	var yearNum, monthNum int
+	var reqStartDate, reqEndDate time.Time
+	historyTime, _ := time.Parse(utils.FormatDate, "2023-04-01")
+
+	if req.StartDate != "" && req.EndDate != "" {
+		st := fmt.Sprint(req.StartDate, "-01 00:00:00")
+		ed := fmt.Sprint(req.EndDate, "-01 23:59:59")
+		reqStartDate, _ = time.Parse(utils.FormatDateTime, st)
+		reqEndDate, _ = time.Parse(utils.FormatDateTime, ed)
+		if reqEndDate.After(latestTime) {
+			yearNum = latestTime.Year() - reqStartDate.Year()
+			monthNum = int(latestTime.Month() - reqStartDate.Month())
+		} else {
+			yearNum = reqEndDate.Year() - reqStartDate.Year()
+			monthNum = int(reqEndDate.Month() - reqStartDate.Month())
+		}
+	} else {
+		yearNum = latestTime.Year() - 2020
+		monthNum = int(latestTime.Month() - 1)
+	}
+
+	if yearNum < 0 {
+		yearNum = -yearNum
+	}
+	if monthNum < 0 {
+		monthNum = -monthNum
+	}
+	numMonth := yearNum*12 + monthNum //共存在多少个月
+	//if req.ListParam == "1" {
+	//	numMonth = numMonth / 3
+	//} else if req.ListParam == "2" {
+	//	numMonth = numMonth / 6
+	//} else if req.ListParam == "3" {
+	//	numMonth = numMonth / 12
+	//}
+	// 累计值
+	var accumulate float64
+	var partAccumulate float64
+	var historyAccumulate float64
+	var partHistoryAccumulate float64
+	//dataList := make([]*fms.IncomeSummaryItem, 0)
+	//historydataList := make([]*fms.IncomeSummaryItem, 0)
+	fmt.Println("numMonth:", numMonth)
+	fmt.Println("InvoiceDate:", latestTime)
+
+	var j int
+	for i := 0; i <= numMonth; i++ {
+		//timeNow, _ := time.Parse("2006-01", time.Now().Format("2006-01"))
+
+		var endDateTime time.Time
+		var prevEndDateTime time.Time
+		var prevStartDate, prevEndDate string
+		var startDate, endDate string
+		//开始日期
+		if req.StartDate != "" && req.EndDate != "" {
+			startDate = reqStartDate.AddDate(0, i, 0).Format("2006-01")
+			prevStartDate = reqStartDate.AddDate(-1, i, 0).Format("2006-01")
+		} else {
+			startDate = latestTime.AddDate(0, i-numMonth, 0).Format("2006-01")
+			prevStartDate = latestTime.AddDate(-1, i-numMonth, 0).Format("2006-01")
+		}
+		startDate = fmt.Sprint(startDate, "-01")
+		prevStartDate = fmt.Sprint(prevStartDate, "-01")
+		startDateTime, _ := time.Parse(utils.FormatDate, startDate)
+		prevStartDateTime, _ := time.Parse(utils.FormatDate, prevStartDate)
+
+		//结束日期
+		if req.StartDate != "" && req.EndDate != "" {
+			endDateTime = reqStartDate.AddDate(0, i+1, -1)
+			prevEndDateTime = reqStartDate.AddDate(-1, i+1, -1)
+			if reqEndDate.After(latestTime) {
+				endDateTime = latestTime.AddDate(0, i-numMonth+1, -1)
+				prevEndDateTime = latestTime.AddDate(-1, i-numMonth+1, -1)
+			}
+		} else {
+			endDateTime = latestTime.AddDate(0, i-numMonth+1, -1)
+			prevEndDateTime = latestTime.AddDate(-1, i-numMonth+1, -1)
+		}
+		endDate = endDateTime.Format(utils.FormatDate)
+		prevEndDate = prevEndDateTime.Format(utils.FormatDate)
+
+		cond := `1 = 1`
+		histrtyCond := `1 = 1`
+		pars := make([]interface{}, 0)
+		historyPars := make([]interface{}, 0)
+
+		prevCond := `1 = 1`
+		prevHistoryCond := `1 = 1`
+		prevPars := make([]interface{}, 0)
+		prevHistoryPars := make([]interface{}, 0)
+
+		if req.CompanyType == 1 {
+			cond += ` AND b.contract_type = 1 `
+			prevCond += ` AND b.contract_type = 1 `
+			histrtyCond += ` AND new_company = 1 `
+			prevHistoryCond += ` AND new_company = 1 `
+		} else if req.CompanyType == 2 {
+			cond += ` AND b.contract_type IN (2,3,4) `
+			prevCond += ` AND b.contract_type IN (2,3,4) `
+			histrtyCond += ` AND new_company = 0 `
+			prevHistoryCond += ` AND new_company = 0 `
+		}
+
+		if req.SellerIds != "" {
+			sellerIds := strings.Split(req.SellerIds, ",")
+			cond += ` AND (c.seller_id in ? OR d.seller_id in ?)`
+			pars = append(pars, sellerIds, sellerIds)
+			prevCond += ` AND (c.seller_id in ? OR d.seller_id in ?)`
+			prevPars = append(prevPars, sellerIds, sellerIds)
+			histrtyCond += ` AND seller_id in ? `
+			prevHistoryCond += ` AND seller_id in ? `
+			historyPars = append(historyPars, sellerIds)
+			prevHistoryPars = append(prevHistoryPars, sellerIds)
+		}
+		//fmt.Println("i:",i)
+		//fmt.Println("j:",j)
+		{
+			//本期
+			st := fmt.Sprint(startDate, " 00:00:00")
+			ed := fmt.Sprint(endDate, " 23:59:59")
+			//校验日期，分段查询
+			if startDateTime.After(historyTime) || startDateTime.Equal(historyTime) {
+				//全部走新查询
+				//fmt.Println("新查询")
+				cond += ` AND ((c.invoice_time BETWEEN ? AND ?) or (d.invoice_time BETWEEN ? AND ?))`
+				pars = append(pars, st, ed, st, ed)
+				summaryIds, e := fms.GetInvoicePaymentCensusSummaryDataIds(cond, pars)
+				if e != nil {
+					return
+				}
+
+				// 开票到款金额合计(换算后)
+				var amountTotal float64
+
+				if len(summaryIds) > 0 {
+					amountCond := `a.id IN ? `
+					amountPars := make([]interface{}, 0)
+					amountPars = append(amountPars, summaryIds)
+					if req.SellerIds != "" {
+						sellerIds := strings.Split(req.SellerIds, ",")
+						amountCond += ` AND (( b.seller_id IN ? AND a.invoice_id <> 0 AND b.invoice_time BETWEEN ? AND ?)`
+						amountCond += `OR ( d.seller_id IN ? AND  a.payment_id <> 0 AND a.invoice_id = 0 AND d.invoice_time BETWEEN ? AND ?)) `
+						amountPars = append(amountPars, sellerIds,st, ed, sellerIds,st, ed)
+					} else {
+						amountCond += ` AND ((a.invoice_id <> 0 AND b.invoice_time BETWEEN ? AND ?)`
+						amountCond += `OR (a.payment_id <> 0 AND a.invoice_id = 0 AND d.invoice_time BETWEEN ? AND ?))`
+						amountPars = append(amountPars, st, ed, st, ed)
+					}
+					results, e := fms.GetContractSummaryIncomeAmount(amountCond, amountPars)
+					if e != nil {
+						err = fmt.Errorf("获取汇总数据失败, Err: %s", e.Error())
+						return
+					}
+					//dataList = append(dataList, results...)
+					var amountSum float64
+					for _, result := range results {
+						incomeChart.DataList = append(incomeChart.DataList, result)
+						amountSum += result.Amount
+						fmt.Println("result.Amount:", result.Amount)
+					}
+					amountTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", amountSum), 64)
+					accumulate += amountTotal
+					partAccumulate += amountTotal
+				}
+				if i == j || i == numMonth {
+					if req.ListParam == "4" {
+						totalMoneySlice = append(totalMoneySlice, accumulate)
+						if startDateTime.Month() == 12 {
+							accumulate = 0
+						}
+					} else if req.ListParam == "0" {
+						totalMoneySlice = append(totalMoneySlice, amountTotal)
+					} else if i > 0 || i == numMonth {
+						totalMoneySlice = append(totalMoneySlice, partAccumulate)
+						fmt.Println("partAccumulate:", partAccumulate)
+						partAccumulate = 0.0
+					}
+				}
+			} else if endDateTime.Before(historyTime) || endDateTime.Equal(historyTime) {
+				//全部走旧查询
+				//fmt.Println("旧查询")
+				//fmt.Println("st:",st)
+				//fmt.Println("ed:",ed)
+				histrtyCond += ` AND (invoice_time BETWEEN ? AND ? )`
+				historyPars = append(historyPars, st, ed)
+				//fmt.Println("st:",st)
+				//fmt.Println("ed:",ed)
+				// 开票到款金额合计(换算后)
+				var amountTotal float64
+				results, e := fms.GetIncomeHistory(histrtyCond, historyPars)
+				if e != nil {
+					err = fmt.Errorf("获取汇总数据失败, Err: %s", e.Error())
+					return
+				}
+				var amountSum float64
+				//dataList = append(dataList, results...)
+				for _, result := range results {
+					incomeChart.DataList = append(incomeChart.DataList, result)
+					amountSum += result.Amount
+				}
+				amountTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", amountSum), 64)
+				accumulate += amountTotal
+				partAccumulate += amountTotal
+
+				if i == j || i == numMonth {
+					if req.ListParam == "4" {
+						totalMoneySlice = append(totalMoneySlice, accumulate)
+						if startDateTime.Month() == 12 {
+							accumulate = 0
+						}
+					} else if req.ListParam == "0" {
+						totalMoneySlice = append(totalMoneySlice, amountTotal)
+					} else if i > 0 || i == numMonth {
+						totalMoneySlice = append(totalMoneySlice, partAccumulate)
+						partAccumulate = 0.0
+					}
+				}
+
+				//fmt.Println("partAccumulate:",partAccumulate)
+			}
+
+		}
+
+		{ //去年同期，用于计算同比值
+			prevSt := fmt.Sprint(prevStartDate, " 00:00:00")
+			prevEd := fmt.Sprint(prevEndDate, " 23:59:59")
+
+			//校验日期，分段查询
+			if prevStartDateTime.After(historyTime) || prevStartDateTime.Equal(historyTime) {
+				//全部走新查询
+				prevCond += ` AND ((b.invoice_time BETWEEN ? AND ?) or (d.invoice_time BETWEEN ? AND ?))`
+				prevPars = append(prevPars, prevSt, prevEd, prevSt, prevEd)
+				prevSummaryIds, e := fms.GetInvoicePaymentCensusSummaryDataIds(prevCond, prevPars)
+				if e != nil {
+					return
+				}
+
+				// 开票到款金额合计(换算后)
+				var prevAmountTotal float64
+
+				if len(prevSummaryIds) > 0 {
+					amountCond := `a.id IN ? `
+					amountPars := make([]interface{}, 0)
+					amountPars = append(amountPars, prevSummaryIds)
+					if req.SellerIds != "" {
+						sellerIds := strings.Split(req.SellerIds, ",")
+						amountCond += ` AND (( b.seller_id IN ? AND a.invoice_id <> 0 AND b.invoice_time BETWEEN ? AND ?)`
+						amountCond += `OR ( d.seller_id IN ? AND  a.payment_id <> 0 AND a.invoice_id = 0 AND d.invoice_time BETWEEN ? AND ?)) `
+						amountPars = append(amountPars, sellerIds,prevSt, prevEd, sellerIds,prevSt, prevEd)
+					} else {
+						amountCond += ` AND ((a.invoice_id <> 0 AND b.invoice_time BETWEEN ? AND ?)`
+						amountCond += `OR (a.payment_id <> 0 AND a.invoice_id = 0 AND d.invoice_time BETWEEN ? AND ?))`
+						amountPars = append(amountPars, prevSt, prevEd)
+					}
+					results, e := fms.GetContractSummaryIncomeAmount(amountCond, amountPars)
+					if e != nil {
+						err = fmt.Errorf("获取汇总数据失败, Err: %s", e.Error())
+						return
+					}
+					var amountSum float64
+					//historydataList = append(historydataList, results...)
+					for _, result := range results {
+						amountSum += result.Amount
+					}
+					prevAmountTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", amountSum), 64)
+					historyAccumulate += prevAmountTotal
+					partHistoryAccumulate += prevAmountTotal
+				}
+				if i == j || i == numMonth {
+					if req.ListParam == "4" {
+						prevTotalMoneySlice = append(prevTotalMoneySlice, historyAccumulate)
+						if prevStartDateTime.Month() == 12 {
+							historyAccumulate = 0
+						}
+					} else if req.ListParam == "0" {
+						prevTotalMoneySlice = append(prevTotalMoneySlice, prevAmountTotal)
+					} else if i > 0 || i == numMonth {
+						prevTotalMoneySlice = append(prevTotalMoneySlice, partHistoryAccumulate)
+						fmt.Println("partHistoryAccumulate:", partHistoryAccumulate)
+						partHistoryAccumulate = 0.0
+					}
+				}
+			} else if prevEndDateTime.Before(historyTime) || prevEndDateTime.Equal(historyTime) {
+				//全部走旧查询
+				fmt.Println("prevSt:", prevSt)
+				fmt.Println("prevEd:", prevEd)
+				prevHistoryCond += ` AND (invoice_time BETWEEN ? AND ?)`
+				prevHistoryPars = append(prevHistoryPars, prevSt, prevEd)
+				// 开票到款金额合计(换算后)
+				var amountTotal float64
+				results, e := fms.GetIncomeHistory(prevHistoryCond, prevHistoryPars)
+				if e != nil {
+					err = fmt.Errorf("获取汇总数据失败, Err: %s", e.Error())
+					return
+				}
+				//historydataList = append(historydataList, results...)
+				var amountSum float64
+				for _, result := range results {
+					amountSum += result.Amount
+				}
+				amountTotal, _ = strconv.ParseFloat(fmt.Sprintf("%.2f", amountSum), 64)
+				historyAccumulate += amountTotal
+				partHistoryAccumulate += amountTotal
+
+				if i == j || i == numMonth {
+					if req.ListParam == "4" {
+						prevTotalMoneySlice = append(prevTotalMoneySlice, historyAccumulate)
+						if prevStartDateTime.Month() == 12 {
+							historyAccumulate = 0
+						}
+					} else if req.ListParam == "0" {
+						prevTotalMoneySlice = append(prevTotalMoneySlice, amountTotal)
+					} else if i > 0 || i == numMonth {
+						prevTotalMoneySlice = append(prevTotalMoneySlice, partHistoryAccumulate)
+						fmt.Println("partHistoryAccumulate:", partHistoryAccumulate)
+						partHistoryAccumulate = 0.0
+					}
+				}
+				//fmt.Println("partHistoryAccumulate:",partHistoryAccumulate)
+			}
+			if req.ListParam == "1" && i == j {
+				if i == 0 {
+					dateSlice = append(dateSlice, startDateTime.AddDate(0, 2, 0).Format("06/01"))
+					j = j + 2
+				} else {
+					dateSlice = append(dateSlice, startDateTime.AddDate(0, 3, 0).Format("06/01"))
+					j = j + 3
+				}
+			} else if req.ListParam == "2" && i == j {
+				if i == 0 {
+					dateSlice = append(dateSlice, startDateTime.AddDate(0, 5, 0).Format("06/01"))
+					j = j + 5
+				} else {
+					dateSlice = append(dateSlice, startDateTime.AddDate(0, 6, 0).Format("06/01"))
+					j = j + 6
+				}
+			} else if req.ListParam == "3" && i == j {
+				if i == 0 {
+					dateSlice = append(dateSlice, startDateTime.AddDate(0, 11, 0).Format("06/01"))
+					j = j + 11
+				} else {
+					dateSlice = append(dateSlice, startDateTime.AddDate(0, 12, 0).Format("06/01"))
+					j = j + 12
+				}
+			} else if i == j {
+				dateSlice = append(dateSlice, startDateTime.Format("06/01"))
+				j++
+			}
+		}
+	}
+
+	fmt.Println("prevTotalMoneySlice:", len(prevTotalMoneySlice))
+	fmt.Println("totalMoneySlice:", len(totalMoneySlice))
+
+	//计算同比值
+	for i := range prevTotalMoneySlice {
+		var yoy float64
+		var yoyStr string
+		//fmt.Println("1：", prevTotalMoneySlice[i])
+		//fmt.Println("2:", totalMoneySlice[i])
+		//fmt.Println("3:", totalMoneySlice[i]-prevTotalMoneySlice[i])
+		totalMoneySlice[i], _ = strconv.ParseFloat(fmt.Sprintf("%.2f", totalMoneySlice[i]), 64)
+		if prevTotalMoneySlice[i] != 0 && totalMoneySlice[i] != 0 {
+			yoy = (totalMoneySlice[i] - prevTotalMoneySlice[i]) / prevTotalMoneySlice[i]
+			yoyStr = fmt.Sprintf("%.4f", yoy)
+
+			if i == len(prevTotalMoneySlice)-1 && i > 0 && req.ListParam == "3" {
+				fmt.Println("totalMoneySlice[i-1]:", totalMoneySlice[i-1])
+				yoy = (totalMoneySlice[i] - totalMoneySlice[i-1]) / totalMoneySlice[i-1]
+				yoyStr = fmt.Sprintf("%.4f", yoy)
+			}
+		}
+		yoySlice = append(yoySlice, yoyStr)
+	}
+
+	incomeChart.Title = "开票到款统计图"
+	incomeChart.Date = dateSlice
+	incomeChart.TotalMoney = totalMoneySlice
+	incomeChart.PrevTotalMoney = prevTotalMoneySlice
+	incomeChart.Yoy = yoySlice
+
+	//redisJsonData, err := json.Marshal(incomeChart)
+	//if err == nil {
+	//	global.Redis.SetEX(context.TODO(), key, string(redisJsonData), time.Minute*30)
+	//}
+	//} else {
+	//	err = json.Unmarshal([]byte(redisJsonData), &incomeChart)
+	//	if err != nil {
+	//		fmt.Println("近两年的收入统计数据，json转换失败")
+	//	}
+	//}
+
+	return
+}
+
+// ExportIncomeList 导出业务收入统计列表
+func ExportIncomeList(c *gin.Context, list []*fms.IncomeSummaryItem) {
+	// 生成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
+	}
+
+	// 数据表头
+	rowTitle := []string{"开票日期", "新客户(1)", "客户名称", "金额", "销售"}
+	titleRow := sheet.AddRow()
+	for i := range rowTitle {
+		v := titleRow.AddCell()
+		v.SetString(rowTitle[i])
+		v.SetStyle(style)
+	}
+	incomeSummaryItemList := make(fms.IncomeSummaryItemList, 0)
+	incomeSummaryItemList = list
+	sort.Sort(incomeSummaryItemList)
+	// 填充数据
+	for _, v := range incomeSummaryItemList {
+		dataRow := sheet.AddRow()
+		dataRow.AddCell().SetString(v.InvoiceDate.Format(utils.FormatDate)) // 开票日期
+		newCompany := 0
+		if v.ContractType == 1 {
+			newCompany = 1
+		}
+		dataRow.AddCell().SetString(strconv.Itoa(newCompany)) // 新客户
+		dataRow.AddCell().SetString(v.CompanyName)            // 客户名称
+		dataRow.AddCell().SetString(fmt.Sprint(v.Amount))     // 金额
+		dataRow.AddCell().SetString(v.SellerName)             // 销售员
+	}
+
+	// 输出文件
+	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/census/seller.go

@@ -223,9 +223,9 @@ func (ct *SellerController) InvoiceList(c *gin.Context) {
 		return
 	}
 	pars := make([]interface{}, 0)
-	outCond := ` a.department_id = %d AND a.enabled = 1 `
+	outCond := ` a.department_id = %d `
 	outCond = fmt.Sprintf(outCond, departmentId)
-	totalCond := ` department_id = %d AND enabled = 1 `
+	totalCond := ` department_id = %d `
 	totalCond = fmt.Sprintf(totalCond, departmentId)
 	totalPars := make([]interface{}, 0)
 	if req.GroupId > 0 {

controller/contract/payment.go

@@ -99,6 +99,24 @@ func (rg *PreRegisterController) List(c *gin.Context) {
 		item := new(fms.ContractPreRegisterList)
 		item.ContractPreRegisterItem = v
 		item.ServicesName = serviceMap[v.ContractRegisterId]
+		if v.HasPayment == 1 {
+			//代付
+			if v.ContractType == 1 {
+				item.ContractTypeString = "代付合同（新签）"
+			} else if v.ContractType == 2 {
+				item.ContractTypeString = "代付合同（续约）"
+			} else {
+				item.ContractTypeString = "代付合同（补充）"
+			}
+		} else {
+			if v.ContractType == 1 {
+				item.ContractTypeString = "自付合同（新签）"
+			} else if v.ContractType == 2 {
+				item.ContractTypeString = "自付合同（续约）"
+			} else {
+				item.ContractTypeString = "自付合同（补充）"
+			}
+		}
 		respList = append(respList, item)
 	}
 
@@ -190,6 +208,8 @@ func (rg *PreRegisterController) Add(c *gin.Context) {
 	ob.HasInvoice = 1
 	ob.Set()
 	ob.CurrencyUnit = currencyUnit
+	ob.ContractType = req.ContractType
+	ob.HasPayment = req.HasPayment
 	if req.RegisterType == fms.ContractInvoiceTypePreMake {
 		//sellerItem := sellerMap[r.SellerId]
 		//if sellerItem == nil {
@@ -219,7 +239,7 @@ func (rg *PreRegisterController) Add(c *gin.Context) {
 		resp.FailMsg("操作失败", "新增合同失败, Err: "+e.Error(), c)
 		return
 	}
-	if ob.ContractRegisterId == 0{
+	if ob.ContractRegisterId == 0 {
 		resp.FailMsg("操作失败", "新增合同失败,合同ID为0", c)
 		return
 	}
@@ -274,21 +294,19 @@ func (rg *PreRegisterController) Add(c *gin.Context) {
 		a, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", v.OriginAmount/rate), 64)
 		v.Amount = a
 
-		if req.RegisterType == fms.ContractInvoiceTypePreMake {
-			sellerItem := sellerMap[r.SellerId]
-			if sellerItem == nil {
-				resp.Fail("销售信息异常", c)
-				return
-			}
-
-			v.SellerId = sellerItem.SellerId
-			v.SellerName = sellerItem.SellerName
-			v.SellerGroupId = sellerItem.GroupId
-			v.SellerGroupName = sellerItem.GroupName
-			v.SellerTeamId = sellerItem.TeamId
-			v.SellerTeamName = sellerItem.TeamName
+		sellerItem := sellerMap[r.SellerId]
+		if sellerItem == nil {
+			resp.Fail("销售信息异常", c)
+			return
 		}
 
+		v.SellerId = sellerItem.SellerId
+		v.SellerName = sellerItem.SellerName
+		v.SellerGroupId = sellerItem.GroupId
+		v.SellerGroupName = sellerItem.GroupName
+		v.SellerTeamId = sellerItem.TeamId
+		v.SellerTeamName = sellerItem.TeamName
+
 		// 新增开票到款记录
 		if e = v.Create(); e != nil {
 			resp.FailMsg("操作失败", "新增预登记失败, Err: "+e.Error(), c)
@@ -310,6 +328,8 @@ func (rg *PreRegisterController) Add(c *gin.Context) {
 		}
 		pp.Set()
 		pp.CurrencyUnit = r.CurrencyUnit
+		pp.ContractType = req.ContractType
+		pp.HasPayment = req.HasPayment
 		if pp.InvoiceType == fms.ContractInvoiceTypePreMake {
 			//开票走开票字段
 			pp.InvoiceId = v.ContractInvoiceId
@@ -330,6 +350,13 @@ func (rg *PreRegisterController) Add(c *gin.Context) {
 			pp.SellerGroupName = sellerItem.GroupName
 			pp.SellerTeamId = sellerItem.TeamId
 			pp.SellerTeamName = sellerItem.TeamName
+
+			pp.PaymentSellerId = sellerItem.SellerId
+			pp.PaymentSellerName = sellerItem.SellerName
+			pp.PaymentSellerGroupId = sellerItem.GroupId
+			pp.PaymentSellerGroupName = sellerItem.GroupName
+			pp.PaymentSellerTeamId = sellerItem.TeamId
+			pp.PaymentSellerTeamName = sellerItem.TeamName
 		} else {
 			//到款
 			pp.ArriveId = v.ContractInvoiceId
@@ -338,10 +365,22 @@ func (rg *PreRegisterController) Add(c *gin.Context) {
 			a, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", pp.ArriveOriginAmount/rate), 64)
 			pp.ArriveAmount = a
 			pp.ArriveRemark = r.Remark
+
+			sellerItem := sellerMap[r.SellerId]
+			if sellerItem == nil {
+				resp.Fail("销售信息异常", c)
+				return
+			}
+			pp.PaymentSellerId = sellerItem.SellerId
+			pp.PaymentSellerName = sellerItem.SellerName
+			pp.PaymentSellerGroupId = sellerItem.GroupId
+			pp.PaymentSellerGroupName = sellerItem.GroupName
+			pp.PaymentSellerTeamId = sellerItem.TeamId
+			pp.PaymentSellerTeamName = sellerItem.TeamName
 		}
 
 		// 新增开票到款记录
-		if pp.ContractRegisterId == 0{
+		if pp.ContractRegisterId == 0 {
 			resp.FailMsg("操作失败", "新增预登记失败,合同ID为0", c)
 			return
 		}
@@ -443,6 +482,8 @@ func (rg *PreRegisterController) Edit(c *gin.Context) {
 	ob.EndDate = endDate
 	ob.ModifyTime = time.Now().Local()
 	ob.CurrencyUnit = currencyUnit
+	ob.ContractType = req.ContractType
+	ob.HasPayment = req.HasPayment
 	if req.RegisterType == fms.ContractInvoiceTypePreMake {
 		//sellerItem := sellerMap[r.SellerId]
 		//if sellerItem == nil {
@@ -469,11 +510,12 @@ func (rg *PreRegisterController) Edit(c *gin.Context) {
 	}
 	updateCols := []string{
 		"ProductIds", "CompanyName", "SellerId", "SellerName", "StartDate", "EndDate",
-		"RaiSellerId", "RaiSellerName", "ModifyTime", "CurrencyUnit",
+		"RaiSellerId", "RaiSellerName", "ModifyTime", "CurrencyUnit","ContractType","HasPayment",
 	}
 
 	invoiceList := make([]*fms.ContractInvoice, 0)
 	ppList := make([]*fms.ContractPreRegister, 0)
+	var sellerItem *crm.SellerAdminWithGroupTeam
 	for _, r := range req.List {
 		// 货币及汇率
 		rateList, e := fmsService.GetTodayCurrencyRateList()
@@ -519,20 +561,19 @@ func (rg *PreRegisterController) Edit(c *gin.Context) {
 		a, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", v.OriginAmount/rate), 64)
 		v.Amount = a
 
-		if req.RegisterType == fms.ContractInvoiceTypePreMake {
-			sellerItem := sellerMap[r.SellerId]
-			if sellerItem == nil {
-				resp.Fail("销售信息异常", c)
-				return
-			}
-
-			v.SellerId = sellerItem.SellerId
-			v.SellerName = sellerItem.SellerName
-			v.SellerGroupId = sellerItem.GroupId
-			v.SellerGroupName = sellerItem.GroupName
-			v.SellerTeamId = sellerItem.TeamId
-			v.SellerTeamName = sellerItem.TeamName
+		sellerItem = sellerMap[r.SellerId]
+		if sellerItem == nil {
+			resp.Fail("销售信息异常", c)
+			return
 		}
+		fmt.Println("SellerId",sellerItem.SellerId)
+		fmt.Println("SellerName",sellerItem.SellerName)
+		v.SellerId = sellerItem.SellerId
+		v.SellerName = sellerItem.SellerName
+		v.SellerGroupId = sellerItem.GroupId
+		v.SellerGroupName = sellerItem.GroupName
+		v.SellerTeamId = sellerItem.TeamId
+		v.SellerTeamName = sellerItem.TeamName
 
 		//预登记列表
 		pp := &fms.ContractPreRegister{
@@ -550,6 +591,8 @@ func (rg *PreRegisterController) Edit(c *gin.Context) {
 		}
 		pp.Set()
 		pp.CurrencyUnit = r.CurrencyUnit
+		pp.ContractType = req.ContractType
+		pp.HasPayment = req.HasPayment
 		ppUpdateCols := make([]string, 0)
 		if pp.InvoiceType == fms.ContractInvoiceTypePreMake {
 			//开票走开票字段
@@ -559,7 +602,7 @@ func (rg *PreRegisterController) Edit(c *gin.Context) {
 			a, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", pp.OriginAmount/rate), 64)
 			pp.Amount = a
 
-			sellerItem := sellerMap[r.SellerId]
+			sellerItem = sellerMap[r.SellerId]
 			if sellerItem == nil {
 				resp.Fail("销售信息异常", c)
 				return
@@ -572,8 +615,16 @@ func (rg *PreRegisterController) Edit(c *gin.Context) {
 			pp.SellerGroupName = sellerItem.GroupName
 			pp.SellerTeamId = sellerItem.TeamId
 			pp.SellerTeamName = sellerItem.TeamName
+
+			pp.PaymentSellerId = sellerItem.SellerId
+			pp.PaymentSellerName = sellerItem.SellerName
+			pp.PaymentSellerGroupId = sellerItem.GroupId
+			pp.PaymentSellerGroupName = sellerItem.GroupName
+			pp.PaymentSellerTeamId = sellerItem.TeamId
+			pp.PaymentSellerTeamName = sellerItem.TeamName
 			ppUpdateCols = append(ppUpdateCols, "InvoiceDate", "Amount", "OriginAmount", "SellerId",
-				"SellerName", "SellerGroupId", "SellerGroupName", "SellerTeamId", "SellerTeamName", "InvoiceId")
+				"SellerName", "SellerGroupId", "SellerGroupName", "SellerTeamId", "SellerTeamName", "InvoiceId",
+				"PaymentSellerId", "PaymentSellerName", "PaymentSellerGroupId", "PaymentSellerGroupName", "PaymentSellerTeamId", "PaymentSellerTeamName","ContractType","HasPayment")
 		} else {
 			//到款
 			pp.ArriveRemark = r.Remark
@@ -582,7 +633,21 @@ func (rg *PreRegisterController) Edit(c *gin.Context) {
 			pp.ArriveOriginAmount = r.Amount
 			a, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", pp.ArriveOriginAmount/rate), 64)
 			pp.ArriveAmount = a
-			ppUpdateCols = append(ppUpdateCols, "CurrencyUnit", "ArriveDate", "ArriveAmount", "ArriveOriginAmount", "ArriveId")
+
+			sellerItem = sellerMap[r.SellerId]
+			if sellerItem == nil {
+				resp.Fail("销售信息异常", c)
+				return
+			}
+
+			pp.PaymentSellerId = sellerItem.SellerId
+			pp.PaymentSellerName = sellerItem.SellerName
+			pp.PaymentSellerGroupId = sellerItem.GroupId
+			pp.PaymentSellerGroupName = sellerItem.GroupName
+			pp.PaymentSellerTeamId = sellerItem.TeamId
+			pp.PaymentSellerTeamName = sellerItem.TeamName
+			ppUpdateCols = append(ppUpdateCols, "CurrencyUnit", "ArriveDate", "ArriveAmount", "ArriveOriginAmount", "ArriveId",
+				"PaymentSellerId", "PaymentSellerName", "PaymentSellerGroupId", "PaymentSellerGroupName", "PaymentSellerTeamId", "PaymentSellerTeamName","ContractType","HasPayment")
 		}
 
 		if pp.PreRegisterId == 0 {
@@ -606,10 +671,10 @@ func (rg *PreRegisterController) Edit(c *gin.Context) {
 	}
 	invoiceUpdateCols := []string{
 		"CurrencyUnit", "OriginAmount", "Amount", "InvoiceDate", "AdminId", "AdminName", "Remark",
-		"ServiceProductId", "StartDate", "EndDate", "ModifyTime",
+		"ServiceProductId", "StartDate", "EndDate", "ModifyTime", "SellerId", "SellerName", "SellerGroupId", "SellerGroupName", "SellerTeamId", "SellerTeamName",
 	}
 	// 更新合同登记、套餐、开票到款
-	if e = fms.UpdateContractPreRegister(ob, updateCols, serviceList, invoiceList, invoiceUpdateCols, req.DelInvoiceIds, req.DelPreRegisterIds, ppList); e != nil {
+	if e = fms.UpdateContractPreRegister(ob, updateCols, serviceList, invoiceList, invoiceUpdateCols, req.DelInvoiceIds, req.DelPreRegisterIds, ppList, sellerItem, req.RegisterType); e != nil {
 		resp.FailMsg("操作失败", "更新合同及套餐失败, Err: "+e.Error(), c)
 		return
 	}
@@ -792,6 +857,19 @@ func (rg *PreRegisterController) Detail(c *gin.Context) {
 		return
 	}
 
+	if req.DetailType == 1 {
+		dupList, e := fms.GetDuplicateContractInvoiceDetailItemListWithType(nItme.CompanyName, nItme.StartDate, nItme.EndDate, req.InvoiceType)
+		if e != nil {
+			err = fmt.Errorf("获取开票到款列表失败, Err: %s", e.Error())
+			return
+		}
+		for _, v := range dupList {
+			if v.ContractRegisterId != req.ContractRegisterId {
+				list = append(list, v)
+			}
+		}
+	}
+
 	//获取ficc小套餐品种
 	sysConf := new(system.SysConfig)
 	confCond := `config_code = ?`
@@ -954,6 +1032,8 @@ func (rg *PreRegisterController) Save(c *gin.Context) {
 	ob.EndDate = endDate
 	ob.ModifyTime = time.Now()
 	ob.CurrencyUnit = req.List[0].CurrencyUnit
+	ob.ContractType = req.ContractType
+	ob.HasPayment = req.HasPayment
 	if req.RegisterType == fms.ContractInvoiceTypePreMake {
 		//sellerItem := sellerMap[r.SellerId]
 		//if sellerItem == nil {
@@ -1030,23 +1110,21 @@ func (rg *PreRegisterController) Save(c *gin.Context) {
 		a, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", v.OriginAmount/rate), 64)
 		v.Amount = a
 
-		if req.RegisterType == fms.ContractInvoiceTypePreMake {
-			sellerItem := sellerMap[r.SellerId]
-			if sellerItem == nil {
-				resp.Fail("销售信息异常", c)
-				return
-			}
-
-			v.SellerId = sellerItem.SellerId
-			v.SellerName = sellerItem.SellerName
-			v.SellerGroupId = sellerItem.GroupId
-			v.SellerGroupName = sellerItem.GroupName
-			v.SellerTeamId = sellerItem.TeamId
-			v.SellerTeamName = sellerItem.TeamName
-			invoiceUpdateCols = append(invoiceUpdateCols, "SellerId", "SellerName", "SellerGroupId",
-				"SellerGroupName", "SellerTeamId", "SellerTeamName")
+		sellerItem := sellerMap[r.SellerId]
+		if sellerItem == nil {
+			resp.Fail("销售信息异常", c)
+			return
 		}
 
+		v.SellerId = sellerItem.SellerId
+		v.SellerName = sellerItem.SellerName
+		v.SellerGroupId = sellerItem.GroupId
+		v.SellerGroupName = sellerItem.GroupName
+		v.SellerTeamId = sellerItem.TeamId
+		v.SellerTeamName = sellerItem.TeamName
+		invoiceUpdateCols = append(invoiceUpdateCols, "SellerId", "SellerName", "SellerGroupId",
+			"SellerGroupName", "SellerTeamId", "SellerTeamName")
+
 		// 新增开票到款记录
 		if v.ContractInvoiceId != 0 {
 			//更新
@@ -1077,6 +1155,8 @@ func (rg *PreRegisterController) Save(c *gin.Context) {
 		}
 		pp.Set()
 		pp.CurrencyUnit = r.CurrencyUnit
+		pp.ContractType = req.ContractType
+		pp.HasPayment = req.HasPayment
 		if pp.InvoiceType == fms.ContractInvoiceTypePreMake {
 			//开票走开票字段
 			pp.Remark = r.Remark
@@ -1097,8 +1177,15 @@ func (rg *PreRegisterController) Save(c *gin.Context) {
 			pp.SellerGroupName = sellerItem.GroupName
 			pp.SellerTeamId = sellerItem.TeamId
 			pp.SellerTeamName = sellerItem.TeamName
+			pp.PaymentSellerId = sellerItem.SellerId
+			pp.PaymentSellerName = sellerItem.SellerName
+			pp.PaymentSellerGroupId = sellerItem.GroupId
+			pp.PaymentSellerGroupName = sellerItem.GroupName
+			pp.PaymentSellerTeamId = sellerItem.TeamId
+			pp.PaymentSellerTeamName = sellerItem.TeamName
 			ppUpdateCols = append(ppUpdateCols, "InvoiceDate", "Amount", "OriginAmount", "SellerId",
-				"SellerName", "SellerGroupId", "SellerGroupName", "SellerTeamId", "SellerTeamName", "Remark")
+				"SellerName", "SellerGroupId", "SellerGroupName", "SellerTeamId", "SellerTeamName", "Remark",
+				"PaymentSellerId", "PaymentSellerName", "PaymentSellerGroupId", "PaymentSellerGroupName", "PaymentSellerTeamId", "PaymentSellerTeamName")
 		} else {
 			//到款
 			pp.ArriveRemark = r.Remark
@@ -1106,7 +1193,21 @@ func (rg *PreRegisterController) Save(c *gin.Context) {
 			pp.ArriveOriginAmount = r.Amount
 			a, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", pp.ArriveOriginAmount/rate), 64)
 			pp.ArriveAmount = a
-			ppUpdateCols = append(ppUpdateCols, "ArriveRemark", "CurrencyUnit", "ArriveDate", "ArriveAmount", "ArriveOriginAmount")
+
+			sellerItem := sellerMap[r.SellerId]
+			if sellerItem == nil {
+				resp.Fail("销售信息异常", c)
+				return
+			}
+
+			pp.PaymentSellerId = sellerItem.SellerId
+			pp.PaymentSellerName = sellerItem.SellerName
+			pp.PaymentSellerGroupId = sellerItem.GroupId
+			pp.PaymentSellerGroupName = sellerItem.GroupName
+			pp.PaymentSellerTeamId = sellerItem.TeamId
+			pp.PaymentSellerTeamName = sellerItem.TeamName
+			ppUpdateCols = append(ppUpdateCols, "ArriveRemark", "CurrencyUnit", "ArriveDate", "ArriveAmount", "ArriveOriginAmount",
+				"PaymentSellerId", "PaymentSellerName", "PaymentSellerGroupId", "PaymentSellerGroupName", "PaymentSellerTeamId", "PaymentSellerTeamName")
 		}
 
 		ppUpdateCols = append(ppUpdateCols,

controller/contract/register.go

@@ -21,6 +21,7 @@ import (
 	"net/http"
 	"os"
 	"path"
+	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -381,8 +382,13 @@ func (rg *RegisterController) Add(c *gin.Context) {
 		resp.FailMsg("操作失败", "获取合同套餐详情失败, Err: "+e.Error(), c)
 		return
 	}
-
+	// 合同有效时长(计算付款方式)
+	dayDiff := ob.EndDate.Sub(ob.StartDate).Hours() / 24
 	// 新增合同及套餐
+	logList := make([]*fms.ContractRegisterLog, 0)
+
+	//是否补录合同
+	sellerItemMap := make(map[int]*crm.SellerAdminWithGroupTeam)
 	if req.Supplement == 1 {
 		//新增到款信息
 		if ob.HasInvoice == 0 {
@@ -405,8 +411,6 @@ func (rg *RegisterController) Add(c *gin.Context) {
 			resp.FailMsg("操作失败", "获取合同开票到款列表失败, Err: "+e.Error(), c)
 			return
 		}
-		// 合同有效时长(计算付款方式)
-		dayDiff := ob.EndDate.Sub(ob.StartDate).Hours() / 24
 
 		// 获取销售分组信息
 		sellerList, e := crmService.GetSellerDepartmentListWithGroupAndTeam()
@@ -418,8 +422,48 @@ func (rg *RegisterController) Add(c *gin.Context) {
 		for i := range sellerList {
 			sellerMap[sellerList[i].SellerId] = sellerList[i]
 		}
-		logList := make([]*fms.ContractRegisterLog, 0)
+		//处理重复公司名日期等重复的开票到款记录
+		dupList, e := fms.GetDuplicateContractInvoiceDetailItemList(ob.CompanyName, req.StartDate, req.EndDate)
+		if e != nil {
+			err = fmt.Errorf("获取开票到款列表失败, Err: %s", e.Error())
+			return
+		}
+		templateIds := make([]int, 0)
+		for _, detail := range serviceList {
+			templateIds = append(templateIds, detail.ServiceTemplateId)
+		}
+		sort.Ints(templateIds)
+		ids := make([]string, 0)
+		for _, id := range templateIds {
+			ids = append(ids, strconv.Itoa(id))
+		}
+		templateIdStr := strings.Join(ids, ",")
+		nDupList := make([]*fms.DupInvoice, 0)
+		for _, dup := range dupList {
+			if templateIdStr == dup.TemplateIds {
+				nDupList = append(nDupList, dup)
+			}
+		}
+
+		//先遍历一遍拿到开票销售信息
+		for _, ppItem := range nDupList {
+			if ppItem.ContractRegisterId != req.ContractRegisterId {
+				j := 0
+				if ppItem.InvoiceType == 3 {
+					sellerItemMap[j] = &crm.SellerAdminWithGroupTeam{
+						SellerId:   ppItem.SellerId,
+						SellerName: ppItem.SellerName,
+						GroupId:    ppItem.SellerGroupId,
+						GroupName:  ppItem.SellerGroupName,
+						TeamId:     ppItem.SellerTeamId,
+						TeamName:   ppItem.SellerTeamName,
+					}
+					j++
+				}
+			}
+		}
 		for _, ppItem := range invoiceList {
+			j,k := 0,0
 			v := &fms.ContractInvoice{
 				ContractRegisterId: ob.ContractRegisterId,
 				ContractCode:       ob.ContractCode,
@@ -441,10 +485,29 @@ func (rg *RegisterController) Add(c *gin.Context) {
 				StartDate:          ppItem.StartDate,
 				EndDate:            ppItem.EndDate,
 			}
+
 			if ppItem.InvoiceType == 3 {
 				v.InvoiceType = 1
+				sellerItemMap[j] = &crm.SellerAdminWithGroupTeam{
+					SellerId:   ppItem.SellerId,
+					SellerName: ppItem.SellerName,
+					GroupId:    ppItem.SellerGroupId,
+					GroupName:  ppItem.SellerGroupName,
+					TeamId:     ppItem.SellerTeamId,
+					TeamName:   ppItem.SellerTeamName,
+				}
+				j++
 			} else if ppItem.InvoiceType == 4 {
 				v.InvoiceType = 2
+				if sellerItem, ok := sellerItemMap[k]; ok {
+					v.SellerId = sellerItem.SellerId
+					v.SellerName = sellerItem.SellerName
+					v.SellerGroupId = sellerItem.GroupId
+					v.SellerGroupName = sellerItem.GroupName
+					v.SellerTeamId = sellerItem.TeamId
+					v.SellerTeamName = sellerItem.TeamName
+				}
+				k++
 			}
 			v.Set()
 			// 到款登记-付款方式
@@ -457,7 +520,10 @@ func (rg *RegisterController) Add(c *gin.Context) {
 				return
 			}
 			opData = string(opDataByte)
-			opType := fms.ContractRegisterOpTypePreInvoice
+			opType := fms.ContractRegisterOpTypePrePay
+			if ppItem.InvoiceType == 3 {
+				opType = fms.ContractRegisterOpTypePreInvoice
+			}
 			newAmount := decimal.NewFromFloat(0).Round(2)
 			a := decimal.NewFromFloat(v.Amount).Round(2)
 			newAmount = newAmount.Add(a)
@@ -484,6 +550,106 @@ func (rg *RegisterController) Add(c *gin.Context) {
 				return
 			}
 		}
+
+		for _, ppItem := range nDupList {
+			if ppItem.ContractRegisterId != req.ContractRegisterId {
+				j := 0
+				v := &fms.ContractInvoice{
+					ContractRegisterId: ob.ContractRegisterId,
+					ContractCode:       ob.ContractCode,
+					Amount:             ppItem.Amount,
+					OriginAmount:       ppItem.OriginAmount,
+					CurrencyUnit:       ppItem.CurrencyUnit,
+					InvoiceDate:        ppItem.InvoiceDate,
+					SellerId:           ppItem.SellerId,
+					SellerName:         ppItem.SellerName,
+					SellerGroupId:      ppItem.SellerGroupId,
+					SellerGroupName:    ppItem.SellerGroupName,
+					SellerTeamId:       ppItem.SellerTeamId,
+					SellerTeamName:     ppItem.SellerTeamName,
+					AdminId:            int(adminInfo.AdminId),
+					AdminName:          adminInfo.RealName,
+					Remark:             ppItem.Remark,
+					ServiceProductId:   ppItem.ServiceProductId,
+					IsPrePay:           1,
+					StartDate:          ppItem.StartDate,
+					EndDate:            ppItem.EndDate,
+				}
+				if ppItem.InvoiceType == 3 {
+					v.InvoiceType = 1
+				} else if ppItem.InvoiceType == 4 {
+					v.InvoiceType = 2
+					if sellerItem, ok := sellerItemMap[j]; ok {
+						v.SellerId = sellerItem.SellerId
+						v.SellerName = sellerItem.SellerName
+						v.SellerGroupId = sellerItem.GroupId
+						v.SellerGroupName = sellerItem.GroupName
+						v.SellerTeamId = sellerItem.TeamId
+						v.SellerTeamName = sellerItem.TeamName
+					}
+					j++
+				}
+				v.Set()
+				// 到款登记-付款方式
+				v.PayType = fmsService.CalculateContractPaymentType(ppItem.Amount, ob.ContractAmount, dayDiff)
+
+				// 新增的记录
+				opData := ""
+				opDataByte, e := json.Marshal(req)
+				if e != nil {
+					return
+				}
+				opData = string(opDataByte)
+				opType := fms.ContractRegisterOpTypePrePay
+				if ppItem.InvoiceType == 3 {
+					opType = fms.ContractRegisterOpTypePreInvoice
+				}
+				newAmount := decimal.NewFromFloat(0).Round(2)
+				a := decimal.NewFromFloat(v.Amount).Round(2)
+				newAmount = newAmount.Add(a)
+				ia, _ := newAmount.Round(2).Float64()
+				logList = append(logList, &fms.ContractRegisterLog{
+					ContractRegisterId: ob.ContractRegisterId,
+					AdminId:            int(adminInfo.AdminId),
+					AdminName:          adminInfo.RealName,
+					OpData:             opData,
+					OpType:             opType,
+					CreateTime:         nowTime,
+					AmountRemark:       fmt.Sprint("新增", fms.ContractInvoiceKeyNameMap[opType], "金额", ia, "元"),
+				})
+
+				if e := v.Create(); e != nil {
+					resp.FailData("日期格式有误", "Err:"+e.Error(), c)
+					return
+				}
+
+				//最后删除预到款记录
+				e = ppItem.Delete()
+				if e != nil {
+					resp.FailMsg("删除预到款记录失败", "Err:"+e.Error(), c)
+					return
+				}
+			}
+
+			ppOB := new(fms.ContractPreRegister)
+			items, e := ppOB.FetchByRegisterId(ppItem.ContractRegisterId)
+			if e != nil {
+				if e == utils.ErrNoRow {
+					resp.Fail("预登记记录不存在或已被删除", c)
+					return
+				}
+				resp.FailMsg("获取预登记失败", "Err:"+e.Error(), c)
+				return
+			}
+			for _, item := range items {
+				e = item.Delete()
+				if e != nil {
+					resp.FailMsg("删除预登记失败", "Err:"+e.Error(), c)
+					return
+				}
+			}
+		}
+
 		ppOB := new(fms.ContractPreRegister)
 		items, e := ppOB.FetchByRegisterId(req.ContractRegisterId)
 		if e != nil {
@@ -526,6 +692,151 @@ func (rg *RegisterController) Add(c *gin.Context) {
 			resp.FailMsg("操作失败", "新增合同及套餐失败, Err: "+e.Error(), c)
 			return
 		}
+		//处理重复公司名日期等重复的开票到款记录
+		dupList, e := fms.GetDuplicateContractInvoiceDetailItemList(ob.CompanyName, req.StartDate, req.EndDate)
+		if e != nil {
+			err = fmt.Errorf("获取开票到款列表失败, Err: %s", e.Error())
+			return
+		}
+		templateIds := make([]int, 0)
+		for _, detail := range serviceList {
+			templateIds = append(templateIds, detail.ServiceTemplateId)
+		}
+		sort.Ints(templateIds)
+		ids := make([]string, 0)
+		for _, id := range templateIds {
+			ids = append(ids, strconv.Itoa(id))
+		}
+		templateIdStr := strings.Join(ids, ",")
+		nDupList := make([]*fms.DupInvoice, 0)
+		for _, dup := range dupList {
+			if templateIdStr == dup.TemplateIds {
+				nDupList = append(nDupList, dup)
+			}
+		}
+		//先遍历一遍拿到开票销售信息
+		for _, ppItem := range nDupList {
+			j := 0
+			if ppItem.ContractRegisterId != req.ContractRegisterId {
+				if ppItem.InvoiceType == 3 {
+					sellerItemMap[j] = &crm.SellerAdminWithGroupTeam{
+						SellerId:   ppItem.SellerId,
+						SellerName: ppItem.SellerName,
+						GroupId:    ppItem.SellerGroupId,
+						GroupName:  ppItem.SellerGroupName,
+						TeamId:     ppItem.SellerTeamId,
+						TeamName:   ppItem.SellerTeamName,
+					}
+				}
+				j++
+			}
+		}
+		for _, ppItem := range nDupList {
+			j := 0
+			if ppItem.ContractRegisterId != req.ContractRegisterId {
+				v := &fms.ContractInvoice{
+					ContractRegisterId: ob.ContractRegisterId,
+					ContractCode:       ob.ContractCode,
+					Amount:             ppItem.Amount,
+					OriginAmount:       ppItem.OriginAmount,
+					CurrencyUnit:       ppItem.CurrencyUnit,
+					InvoiceDate:        ppItem.InvoiceDate,
+					SellerId:           ppItem.SellerId,
+					SellerName:         ppItem.SellerName,
+					SellerGroupId:      ppItem.SellerGroupId,
+					SellerGroupName:    ppItem.SellerGroupName,
+					SellerTeamId:       ppItem.SellerTeamId,
+					SellerTeamName:     ppItem.SellerTeamName,
+					AdminId:            int(adminInfo.AdminId),
+					AdminName:          adminInfo.RealName,
+					Remark:             ppItem.Remark,
+					ServiceProductId:   ppItem.ServiceProductId,
+					IsPrePay:           1,
+					StartDate:          ppItem.StartDate,
+					EndDate:            ppItem.EndDate,
+				}
+				if ppItem.InvoiceType == 3 {
+					v.InvoiceType = 1
+				} else if ppItem.InvoiceType == 4 {
+					v.InvoiceType = 2
+					if sellerItem, ok := sellerItemMap[j]; ok{
+						v.SellerId = sellerItem.SellerId
+						v.SellerName = sellerItem.SellerName
+						v.SellerGroupId = sellerItem.GroupId
+						v.SellerGroupName = sellerItem.GroupName
+						v.SellerTeamId = sellerItem.TeamId
+						v.SellerTeamName = sellerItem.TeamName
+
+						j++
+					}
+				}
+				v.Set()
+				// 到款登记-付款方式
+				v.PayType = fmsService.CalculateContractPaymentType(ppItem.Amount, ob.ContractAmount, dayDiff)
+
+				// 新增的记录
+				opData := ""
+				opDataByte, e := json.Marshal(req)
+				if e != nil {
+					return
+				}
+				opData = string(opDataByte)
+				opType := fms.ContractRegisterOpTypePrePay
+				if ppItem.InvoiceType == 3 {
+					opType = fms.ContractRegisterOpTypePreInvoice
+				}
+				newAmount := decimal.NewFromFloat(0).Round(2)
+				a := decimal.NewFromFloat(v.Amount).Round(2)
+				newAmount = newAmount.Add(a)
+				ia, _ := newAmount.Round(2).Float64()
+				logList = append(logList, &fms.ContractRegisterLog{
+					ContractRegisterId: ob.ContractRegisterId,
+					AdminId:            int(adminInfo.AdminId),
+					AdminName:          adminInfo.RealName,
+					OpData:             opData,
+					OpType:             opType,
+					CreateTime:         nowTime,
+					AmountRemark:       fmt.Sprint("新增", fms.ContractInvoiceKeyNameMap[opType], "金额", ia, "元"),
+				})
+
+				if e := v.Create(); e != nil {
+					resp.FailData("日期格式有误", "Err:"+e.Error(), c)
+					return
+				}
+
+				//最后删除预到款记录
+				e = ppItem.Delete()
+				if e != nil {
+					resp.FailMsg("删除预到款记录失败", "Err:"+e.Error(), c)
+					return
+				}
+
+				ppOB := new(fms.ContractPreRegister)
+				items, e := ppOB.FetchByRegisterId(ppItem.ContractRegisterId)
+				if e != nil {
+					if e == utils.ErrNoRow {
+						resp.Fail("预登记记录不存在或已被删除", c)
+						return
+					}
+					resp.FailMsg("获取预登记失败", "Err:"+e.Error(), c)
+					return
+				}
+				for _, item := range items {
+					e = item.Delete()
+					if e != nil {
+						resp.FailMsg("删除预登记失败", "Err:"+e.Error(), c)
+						return
+					}
+				}
+			}
+		}
+		// 操作日志
+		go func() {
+			logOB := new(fms.ContractRegisterLog)
+			if e := logOB.AddInBatches(logList); e != nil {
+				return
+			}
+		}()
 	}
 
 	// 操作日志
@@ -962,11 +1273,11 @@ func (rg *RegisterController) Detail(c *gin.Context) {
 	result.InvoiceList = make([]*fms.ContractInvoiceItem, 0)
 	result.PaymentList = make([]*fms.ContractInvoiceItem, 0)
 	for i := range invoiceList {
-		if invoiceList[i].InvoiceType == fms.ContractInvoiceTypeMake  || invoiceList[i].InvoiceType == fms.ContractInvoiceTypePreMake{
+		if invoiceList[i].InvoiceType == fms.ContractInvoiceTypeMake || invoiceList[i].InvoiceType == fms.ContractInvoiceTypePreMake {
 			result.InvoiceList = append(result.InvoiceList, invoiceList[i])
 			continue
 		}
-		if invoiceList[i].InvoiceType == fms.ContractInvoiceTypePay || invoiceList[i].InvoiceType == fms.ContractInvoiceTypePrePay{
+		if invoiceList[i].InvoiceType == fms.ContractInvoiceTypePay || invoiceList[i].InvoiceType == fms.ContractInvoiceTypePrePay {
 			result.PaymentList = append(result.PaymentList, invoiceList[i])
 		}
 	}
@@ -1091,6 +1402,7 @@ func (rg *RegisterController) Invoice(c *gin.Context) {
 
 	noChangeInvoiceIds := make([]int, 0)
 	newInvoice := make([]*fms.ContractInvoice, 0)
+	sellerMap := make(map[int]*crm.SellerAdminWithGroupTeam)
 	if len(req.AmountList) > 0 {
 		// 合同有效时长(计算付款方式)
 		dayDiff := item.EndDate.Sub(item.StartDate).Hours() / 24
@@ -1101,7 +1413,6 @@ func (rg *RegisterController) Invoice(c *gin.Context) {
 			resp.FailData("获取销售失败", "Err:"+e.Error(), c)
 			return
 		}
-		sellerMap := make(map[int]*crm.SellerAdminWithGroupTeam)
 		for i := range sellerList {
 			sellerMap[sellerList[i].SellerId] = sellerList[i]
 		}
@@ -1155,10 +1466,6 @@ func (rg *RegisterController) Invoice(c *gin.Context) {
 						resp.Fail("销售信息异常", c)
 						return
 					}
-					if req.AmountList[i].ServiceProductId == crm.CompanyProductFicc && sellerItem.DepartmentId != crm.SellerDepartmentId {
-						resp.Fail("销售类型和所选套餐类型不一致", c)
-						return
-					}
 					if req.AmountList[i].ServiceProductId == crm.CompanyProductRai && sellerItem.DepartmentId != crm.RaiSellerDepartmentId {
 						resp.Fail("销售类型和所选套餐类型不一致", c)
 						return
@@ -1172,6 +1479,21 @@ func (rg *RegisterController) Invoice(c *gin.Context) {
 				}
 				// 到款登记-付款方式
 				if req.InvoiceType == fms.ContractInvoiceTypePay {
+					sellerItem := sellerMap[req.AmountList[i].SellerId]
+					if sellerItem == nil {
+						resp.Fail("销售信息异常", c)
+						return
+					}
+					if req.AmountList[i].ServiceProductId == crm.CompanyProductRai && sellerItem.DepartmentId != crm.RaiSellerDepartmentId {
+						resp.Fail("销售类型和所选套餐类型不一致", c)
+						return
+					}
+					v.SellerId = sellerItem.SellerId
+					v.SellerName = sellerItem.SellerName
+					v.SellerGroupId = sellerItem.GroupId
+					v.SellerGroupName = sellerItem.GroupName
+					v.SellerTeamId = sellerItem.TeamId
+					v.SellerTeamName = sellerItem.TeamName
 					v.PayType = fmsService.CalculateContractPaymentType(req.AmountList[i].Amount, item.ContractAmount, dayDiff)
 				}
 				newInvoice = append(newInvoice, v)
@@ -1244,6 +1566,33 @@ func (rg *RegisterController) Invoice(c *gin.Context) {
 		return
 	}
 
+	//如果是开票，强制修改到款记录的销售
+	if len(newInvoice) > 0 && req.InvoiceType == fms.ContractInvoiceTypeMake {
+		invoiceItem, err := fms.GetContractInvoiceByRegisterIdAndType(req.ContractRegisterId)
+		if err != nil && err != utils.ErrNoRow {
+			resp.FailMsg("获取到款数据失败", "获取到款数据失败, Err: "+err.Error(), c)
+			return
+		}
+		if err == nil {
+			sellerItem := sellerMap[newInvoice[0].SellerId]
+			if sellerItem == nil {
+				resp.Fail("销售信息异常", c)
+				return
+			}
+			invoiceItem.SellerId = sellerItem.SellerId
+			invoiceItem.SellerName = sellerItem.SellerName
+			invoiceItem.SellerGroupId = sellerItem.GroupId
+			invoiceItem.SellerGroupName = sellerItem.GroupName
+			invoiceItem.SellerTeamId = sellerItem.TeamId
+			invoiceItem.SellerTeamName = sellerItem.TeamName
+			e = invoiceItem.Update([]string{"SellerId", "SellerName", "SellerGroupId", "SellerGroupName", "SellerTeamId", "SellerTeamName"})
+			if e != nil {
+				resp.FailMsg("更新到款销售失败", "更新到款销售失败, Err: "+e.Error(), c)
+				return
+			}
+		}
+	}
+
 	// todo 判断是否符合均分金额的条件，如果符合，需要生成金额分配记录表
 	if req.InvoiceType == fms.ContractInvoiceTypePay {
 		err = fmsService.CalculatePaymentServiceAmount(req.ContractRegisterId)
@@ -1682,7 +2031,7 @@ func (rg *RegisterController) Export(c *gin.Context) {
 	row3Title := make([]string, 0)
 	row3TitleParent := make([]string, 0)
 	row3Title = append(row3Title, "客户名称", "新客户\n0-是\n1-否", "合同类型\n0-自付合同\n1-代付合同",
-		"合同子类型\n续约-0\n新签-1\n补充协议-2", "合同所属方", "代付方" ,"关联主合同（补充协议）", "关联合同（代付合同）")
+		"合同子类型\n续约-0\n新签-1\n补充协议-2", "合同所属方", "代付方", "关联主合同（补充协议）", "关联合同（代付合同）")
 	if req.ListParam == 0 {
 		row3Title = append(row3Title, "FICC销售", "权益销售", "FICC大套餐")
 		for i := range permissionList {
@@ -1756,7 +2105,7 @@ func (rg *RegisterController) Export(c *gin.Context) {
 			row3Title = append(row3Title, t)
 		}
 	}
-	paymentTitle := []string{"到款日", "到款金额", "套餐类型", "备注"}
+	paymentTitle := []string{"到款日", "到款金额", "套餐类型", "销售", "备注"}
 	for i := 0; i < maxPayment; i++ {
 		n := i + 1
 		for ii := range paymentTitle {
@@ -1773,7 +2122,7 @@ func (rg *RegisterController) Export(c *gin.Context) {
 		row2NameKeyMap[row3Title[i]] = i
 	}
 
-	newCompanyMap := map[int]string{0: "1", 1: "0"}
+	newCompanyMap := map[int]string{2: "1", 1: "0"}
 	contractTMap := map[int]int{
 		fms.ContractTypeSelf:   0,
 		fms.ContractTypebehalf: 1,
@@ -1788,7 +2137,7 @@ func (rg *RegisterController) Export(c *gin.Context) {
 		dataRow := sheet.AddRow()
 		dataRow.SetHeight(20)
 		dataRow.AddCell().SetString(v.CompanyName)
-		dataRow.AddCell().SetString(newCompanyMap[v.NewCompany])
+		dataRow.AddCell().SetString(newCompanyMap[v.ContractType])
 		dataRow.AddCell().SetString(fmt.Sprint(contractTMap[v.HasPayment]))
 		dataRow.AddCell().SetString(fmt.Sprint(contractSubTMap[v.ContractType]))
 		if v.HasPayment == 1 {
@@ -1803,16 +2152,15 @@ func (rg *RegisterController) Export(c *gin.Context) {
 		dataRow.AddCell().SetString(v.ActualPayCompanies)
 		dataRow.AddCell().SetString(v.RelateContractMainCode)
 		dataRow.AddCell().SetString(v.RelateContractCode)
-		if req.ListParam == 0{
+		if req.ListParam == 0 {
 			dataRow.AddCell().SetString(v.SellerName)
 			dataRow.AddCell().SetString(v.RaiSellerName)
-		} else if req.ListParam == 1{
+		} else if req.ListParam == 1 {
 			dataRow.AddCell().SetString(v.SellerName)
 		} else {
 			dataRow.AddCell().SetString(v.RaiSellerName)
 		}
 
-
 		if req.ListParam != 0 {
 			k += 10
 		} else {
@@ -1879,13 +2227,13 @@ func (rg *RegisterController) Export(c *gin.Context) {
 		dataRow.AddCell().SetString(v.CurrencyUnit)                                      // 货币单位
 		if ficcAmount != nil {
 			dataRow.AddCell().SetString(fmt.Sprint("￥", ficcAmount.ServiceAmount)) // FICC套餐总金额
-			if raiAmount == nil{
-				dataRow.AddCell().SetString("")                                        // 权益套餐总金额
+			if raiAmount == nil {
+				dataRow.AddCell().SetString("") // 权益套餐总金额
 			}
 		}
 		if raiAmount != nil {
-			if ficcAmount == nil{
-				dataRow.AddCell().SetString("")                                       // 权益套餐总金额
+			if ficcAmount == nil {
+				dataRow.AddCell().SetString("") // 权益套餐总金额
 			}
 			dataRow.AddCell().SetString(fmt.Sprint("￥", raiAmount.ServiceAmount)) // FICC套餐总金额
 		}
@@ -1928,6 +2276,7 @@ func (rg *RegisterController) Export(c *gin.Context) {
 					dataRow.AddCell().SetString(utils.TimeTransferString("2006/01/02", pyList[ib].InvoiceDate)) // 收款日
 					dataRow.AddCell().SetString(fmt.Sprint(pyList[ib].OriginAmount))                            // 收款金额
 					dataRow.AddCell().SetString(serviceProductIdMap[pyList[ib].ServiceProductId])               // 套餐类型
+					dataRow.AddCell().SetString(pyList[ib].SellerName)                                          // 销售名称
 					dataRow.AddCell().SetString(pyList[ib].Remark)                                              // 收款备注
 					continue
 				}
@@ -2223,7 +2572,8 @@ func (rg *RegisterController) Import(c *gin.Context) {
 		resp.Fail("请上传Excel文件", c)
 		return
 	}
-
+	claims, _ := c.Get("adminInfo")
+	adminInfo := claims.(*system.SysAdmin)
 	uploadDir := "static/xls"
 	err = os.MkdirAll(uploadDir, 766)
 	if err != nil {
@@ -2244,7 +2594,7 @@ func (rg *RegisterController) Import(c *gin.Context) {
 		resp.FailData("打开文件失败", "Err:"+err.Error(), c)
 		return
 	}
-
+	logList := make([]*fms.ContractRegisterLog, 0)
 	// 获取所有已登记，根据合同编号去重
 	contractCodeArr := make([]string, 0)
 	registerOB := new(fms.ContractRegister)
@@ -2371,6 +2721,8 @@ func (rg *RegisterController) Import(c *gin.Context) {
 	for _, sheet := range xlFile.Sheets {
 		// 遍历行读取
 		maxRow := sheet.MaxRow
+		fmt.Println("maxRow", maxRow)
+		var dayDiff float64
 		for i := 0; i < maxRow; i++ {
 			// 第三行开始读取表头
 			if i == 2 {
@@ -2479,11 +2831,12 @@ func (rg *RegisterController) Import(c *gin.Context) {
 					v := utils.TrimStr(cell.String())
 					// 客户名称
 					if k == 0 {
-						if v == "" {
+						//pool_474 客户名称保留空格
+						if cell.String() == "" {
 							resp.Fail(fmt.Sprintf("第%d行客户名称不可为空, 请按模板导入", i+1), c)
 							return
 						}
-						rowRegister.CompanyName = v
+						rowRegister.CompanyName = cell.String()
 						continue
 					}
 					// 是否新客户
@@ -2517,7 +2870,7 @@ func (rg *RegisterController) Import(c *gin.Context) {
 						continue
 					}
 					if k == 4 {
-						if rowRegister.HasPayment == 1{
+						if rowRegister.HasPayment == 1 {
 							if v == "0" {
 								//所属方为实际使用方，不走开票到款流程
 								rowRegister.HasInvoice = 0
@@ -2823,11 +3176,7 @@ func (rg *RegisterController) Import(c *gin.Context) {
 					// FICC 套餐总金额
 					if k == 62 {
 						amountStr := v
-						amount, e := strconv.ParseFloat(amountStr, 64)
-						if e != nil {
-							resp.Fail(fmt.Sprintf("第%d行FICC套餐总金额有误, 请按模板导入", i+1), c)
-							return
-						}
+						amount, _ := strconv.ParseFloat(amountStr, 64)
 						if amount > 0 {
 							tmp := &fms.ContractServiceAmount{
 								ProductId:     crm.CompanyProductFicc,
@@ -2842,11 +3191,7 @@ func (rg *RegisterController) Import(c *gin.Context) {
 					// 权益套餐总金额
 					if k == 63 {
 						amountStr := v
-						amount, e := strconv.ParseFloat(amountStr, 64)
-						if e != nil {
-							resp.Fail(fmt.Sprintf("第%d行权益套餐总金额有误, 请按模板导入", i+1), c)
-							return
-						}
+						amount, _ := strconv.ParseFloat(amountStr, 64)
 						if amount > 0 {
 							tmp := &fms.ContractServiceAmount{
 								ProductId:     crm.CompanyProductRai,
@@ -3046,7 +3391,7 @@ func (rg *RegisterController) Import(c *gin.Context) {
 									return
 								}
 								// 付款方式
-								dayDiff := rowRegister.EndDate.Sub(rowRegister.StartDate).Hours() / 24
+								dayDiff = rowRegister.EndDate.Sub(rowRegister.StartDate).Hours() / 24
 								contractAmount := rowRegister.ContractAmount
 								payType := fmsService.CalculateContractPaymentType(amount, contractAmount, dayDiff)
 								rowPayments[ir].PayType = payType
@@ -3073,6 +3418,25 @@ func (rg *RegisterController) Import(c *gin.Context) {
 							continue
 						}
 
+						// 到款销售
+						k2 += 1
+						if k == k2 {
+							if v != "" {
+								sellerItem := sellerMap[v]
+								if sellerItem == nil {
+									resp.Fail(fmt.Sprintf("第%d行到款销售名称与系统销售不匹配, 请核对名称后导入", i+1), c)
+									return
+								}
+								rowPayments[ir].SellerId = sellerItem.SellerId
+								rowPayments[ir].SellerName = sellerItem.SellerName
+								rowPayments[ir].SellerGroupId = sellerItem.GroupId
+								rowPayments[ir].SellerGroupName = sellerItem.GroupName
+								rowPayments[ir].SellerTeamId = sellerItem.TeamId
+								rowPayments[ir].SellerTeamName = sellerItem.TeamName
+							}
+							continue
+						}
+
 						// 备注
 						k2 += 1
 						if k == k2 {
@@ -3147,13 +3511,163 @@ func (rg *RegisterController) Import(c *gin.Context) {
 					resp.FailData(fmt.Sprintf("第%d行导入失败", i+1), "新增导入登记失败, Err: "+e.Error(), c)
 					return
 				}
+
+				//处理重复公司名日期等重复的开票到款记录
+				sellerItemMap := make(map[int]*crm.SellerAdminWithGroupTeam)
+				dupList, e := fms.GetDuplicateContractInvoiceDetailItemList(rowRegister.CompanyName, rowRegister.StartDate.Format(utils.FormatDate), rowRegister.EndDate.Format(utils.FormatDate))
+				if e != nil {
+					err = fmt.Errorf("获取开票到款列表失败, Err: %s", e.Error())
+					return
+				}
+				templateIds := make([]int, 0)
+				for _, detail := range rowServices {
+					templateIds = append(templateIds, detail.ServiceTemplateId)
+				}
+				sort.Ints(templateIds)
+				ids := make([]string, 0)
+				for _, id := range templateIds {
+					ids = append(ids, strconv.Itoa(id))
+				}
+				templateIdStr := strings.Join(ids, ",")
+				nDupList := make([]*fms.DupInvoice, 0)
+				for _, dup := range dupList {
+					if templateIdStr == dup.TemplateIds {
+						nDupList = append(nDupList, dup)
+					}
+				}
+				//先遍历一遍拿到开票销售信息
+				for _, ppItem := range dupList {
+					j := 0
+					if ppItem.ContractRegisterId != newId {
+						if ppItem.InvoiceType == 3 {
+							sellerItemMap[j] = &crm.SellerAdminWithGroupTeam{
+								SellerId:   ppItem.SellerId,
+								SellerName: ppItem.SellerName,
+								GroupId:    ppItem.SellerGroupId,
+								GroupName:  ppItem.SellerGroupName,
+								TeamId:     ppItem.SellerTeamId,
+								TeamName:   ppItem.SellerTeamName,
+							}
+						}
+						j++
+					}
+				}
+				for _, ppItem := range dupList {
+					j := 0
+					if ppItem.ContractRegisterId != newId {
+						v := &fms.ContractInvoice{
+							ContractRegisterId: newId,
+							ContractCode:       rowRegister.ContractCode,
+							Amount:             ppItem.Amount,
+							OriginAmount:       ppItem.OriginAmount,
+							CurrencyUnit:       ppItem.CurrencyUnit,
+							InvoiceDate:        ppItem.InvoiceDate,
+							SellerId:           ppItem.SellerId,
+							SellerName:         ppItem.SellerName,
+							SellerGroupId:      ppItem.SellerGroupId,
+							SellerGroupName:    ppItem.SellerGroupName,
+							SellerTeamId:       ppItem.SellerTeamId,
+							SellerTeamName:     ppItem.SellerTeamName,
+							AdminId:            int(adminInfo.AdminId),
+							AdminName:          adminInfo.RealName,
+							Remark:             ppItem.Remark,
+							ServiceProductId:   ppItem.ServiceProductId,
+							IsPrePay:           1,
+							StartDate:          ppItem.StartDate,
+							EndDate:            ppItem.EndDate,
+						}
+						if ppItem.InvoiceType == 3 {
+							v.InvoiceType = 1
+						} else if ppItem.InvoiceType == 4 {
+							v.InvoiceType = 2
+							if sellerItem, ok := sellerItemMap[j]; ok{
+								v.SellerId = sellerItem.SellerId
+								v.SellerName = sellerItem.SellerName
+								v.SellerGroupId = sellerItem.GroupId
+								v.SellerGroupName = sellerItem.GroupName
+								v.SellerTeamId = sellerItem.TeamId
+								v.SellerTeamName = sellerItem.TeamName
+
+								j++
+							}
+						}
+						v.Set()
+						// 到款登记-付款方式
+						v.PayType = fmsService.CalculateContractPaymentType(ppItem.Amount, rowRegister.ContractAmount, dayDiff)
+
+						// 新增的记录
+						opData := ""
+						//opDataByte, e := json.Marshal(req)
+						if e != nil {
+							return
+						}
+						//opData = string(opDataByte)
+						opType := fms.ContractRegisterOpTypePrePay
+						if ppItem.InvoiceType == 3 {
+							opType = fms.ContractRegisterOpTypePreInvoice
+						}
+						newAmount := decimal.NewFromFloat(0).Round(2)
+						a := decimal.NewFromFloat(v.Amount).Round(2)
+						newAmount = newAmount.Add(a)
+						ia, _ := newAmount.Round(2).Float64()
+						logList = append(logList, &fms.ContractRegisterLog{
+							ContractRegisterId: newId,
+							AdminId:            int(adminInfo.AdminId),
+							AdminName:          adminInfo.RealName,
+							OpData:             opData,
+							OpType:             opType,
+							CreateTime:         time.Now().Local(),
+							AmountRemark:       fmt.Sprint("新增", fms.ContractInvoiceKeyNameMap[opType], "金额", ia, "元"),
+						})
+
+						if e := v.Create(); e != nil {
+							resp.FailData("日期格式有误", "Err:"+e.Error(), c)
+							return
+						}
+
+						//最后删除预到款记录
+						e = ppItem.Delete()
+						if e != nil {
+							resp.FailMsg("删除预到款记录失败", "Err:"+e.Error(), c)
+							return
+						}
+
+						ppOB := new(fms.ContractPreRegister)
+						items, e := ppOB.FetchByRegisterId(ppItem.ContractRegisterId)
+						if e != nil {
+							if e == utils.ErrNoRow {
+								resp.Fail("预登记记录不存在或已被删除", c)
+								return
+							}
+							resp.FailMsg("获取预登记失败", "Err:"+e.Error(), c)
+							return
+						}
+						for _, item := range items {
+							e = item.Delete()
+							if e != nil {
+								resp.FailMsg("删除预登记失败", "Err:"+e.Error(), c)
+								return
+							}
+						}
+					}
+				}
 				// 自动分配套餐金额
 				go fmsService.CalculatePaymentServiceAmount(newId)
 				newIds = append(newIds, newId)
+
+
 			}
 		}
 	}
 
+	// 操作日志
+	go func() {
+		logOB := new(fms.ContractRegisterLog)
+		if e := logOB.AddInBatches(logList); e != nil {
+			return
+		}
+	}()
+
 	resp.Ok("操作成功", c)
 }
 
@@ -3265,3 +3779,104 @@ func (rg *RegisterController) CheckContractName(c *gin.Context) {
 	resp.OkData("查询成功", data, c)
 	return
 }
+
+// CheckContract
+// @Title 货币单位列表
+// @Description 货币单位列表
+// @Success 200 {object} fms.CheckContractNameResp
+// @router /contract/register/check_contract_duplicate [post]
+func (rg *RegisterController) CheckContractDuplicate(c *gin.Context) {
+	var req fms.CheckContractDuplicateReq
+	if e := c.ShouldBind(&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
+	}
+	existCond := ""
+	existPars := make([]interface{}, 0)
+	if req.CompanyName != "" {
+		// 是否存在相同的合同名称的登记
+		existCond = ` company_name = ?`
+		existPars = append(existPars, req.CompanyName)
+	}
+
+	if req.StartDate != "" && req.EndDate != "" {
+		// 日期校验
+		startDate, e := time.ParseInLocation(utils.FormatDate, req.StartDate, time.Local)
+		if e != nil {
+			resp.FailMsg("合同开始日期格式有误", "合同开始日期格式有误, Err: "+e.Error(), c)
+			return
+		}
+		endDate, e := time.ParseInLocation(utils.FormatDate, req.EndDate, time.Local)
+		if e != nil {
+			resp.FailMsg("合同结束日期格式有误", "合同结束日期格式有误, Err: "+e.Error(), c)
+			return
+		}
+		if existCond != "" {
+			existCond += ` AND (start_date =? and end_date=?)`
+		} else {
+			existCond = ` start_date = ? and end_date=?`
+		}
+
+		existPars = append(existPars, startDate, endDate)
+	}
+
+	if existCond == "" {
+		resp.Fail("请输入合同名称或者合同有效期", c)
+		return
+	}
+	data := fms.CheckContractDuplicateResp{
+		Exist: 0,
+	}
+
+	// 是否存在相同合同名称的登记
+	list, e := fms.CheckContractDuplicate(existCond, existPars)
+	if e != nil {
+		resp.FailMsg("操作失败", "查询重复合同失败, Err: "+e.Error(), c)
+		return
+	}
+
+	registerIds := make([]int, 0)
+	for i := range list {
+		registerIds = append(registerIds, list[i].ContractRegisterId)
+	}
+
+	idlist, e := fms.CheckContractServiceDuplicate(registerIds)
+	if e != nil {
+		resp.FailMsg("操作失败", "查询重复合同套餐失败, Err: "+e.Error(), c)
+		return
+	}
+
+	//校验套餐
+	if len(req.Services) > 0 {
+		serviceAmountMap := make(map[int]float64)
+		serviceList, e := fmsService.HandleContractServiceAndDetail(req.Services, true, serviceAmountMap)
+		if e != nil {
+			resp.FailMsg("操作失败", "获取合同套餐详情失败, Err: "+e.Error(), c)
+			return
+		}
+		templateIds := make([]int, 0)
+		for _, detail := range serviceList {
+			templateIds = append(templateIds, detail.ServiceTemplateId)
+		}
+		sort.Ints(templateIds)
+		ids := make([]string, 0)
+		for _, id := range templateIds {
+			ids = append(ids, strconv.Itoa(id))
+		}
+		templateIdStr := strings.Join(ids, ",")
+
+		for _, s := range idlist {
+			if templateIdStr == *s {
+				data.Exist = 1
+			}
+		}
+	}
+
+	resp.OkData("查询成功", data, c)
+	return
+}

controller/contract/service.go

@@ -1,11 +1,13 @@
 package crm
 
 import (
+	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/go-playground/validator/v10"
 	"hongze/fms_api/controller/resp"
 	"hongze/fms_api/global"
 	"hongze/fms_api/models/crm"
+	"hongze/fms_api/models/fms"
 	crmService "hongze/fms_api/services/crm"
 )
 
@@ -83,4 +85,51 @@ func (rg *CompanySellerController) AllList(c *gin.Context) {
 		RaiSeller:  raiLits,
 	}
 	resp.OkData("获取成功", respItem, c)
+}
+
+// List
+// @Title 销售列表
+// @Description 销售列表
+// @Success 200 {object} crm.SellerAdminWithGroupList
+// @router /crm/company_seller/team_list [get]
+func (rg *CompanySellerController) TeamList(c *gin.Context) {
+	// 此处调整为只取销售部门的人员, 而不是原先的根据角色取
+	list, e := crmService.GetSellerList()
+	if e != nil {
+		resp.FailData("获取销售失败", "Err:"+e.Error(), c)
+		return
+	}
+
+
+	resp.OkData("获取成功", list, c)
+}
+
+func FIX() (err error) {
+	adminCond := ``
+	adminPars := make([]interface{}, 0)
+	adminOB := new(crm.Admin)
+	adminList, e := adminOB.List(adminCond, adminPars)
+	if e != nil {
+		return
+	}
+	sellerMap := make(map[string]*crm.Admin)
+	for i := range adminList {
+		sellerMap[adminList[i].RealName] = adminList[i]
+	}
+
+	list,err := fms.GetIncomeHistoryList()
+	if err != nil {
+		return
+	}
+	for _, v := range list {
+		fmt.Println("v:", v.IncomeId)
+		if seller, ok := sellerMap[v.SellerName]; ok{
+			v.SellerId = seller.AdminId
+			if e = v.Update([]string{"SellerId"}); e != nil {
+				fmt.Println("更新销售失败, Err: " + e.Error())
+				return
+			}
+		}
+	}
+	return
 }

controller/crm/contract.go

@@ -1,6 +1,6 @@
 module hongze/fms_api
 
-go 1.15
+go 1.19
 
 require (
 	github.com/aliyun/alibaba-cloud-sdk-go v1.61.1754
@@ -14,11 +14,8 @@ require (
 	github.com/go-playground/validator/v10 v10.9.0
 	github.com/go-redis/redis/v8 v8.11.4
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
-	github.com/jonboulle/clockwork v0.2.2 // indirect
 	github.com/json-iterator/go v1.1.12
 	github.com/lestrrat-go/file-rotatelogs v2.4.0+incompatible
-	github.com/lestrrat-go/strftime v1.0.5 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/olivere/elastic/v7 v7.0.31
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/rdlucklib/rdluck_tools v1.0.3
@@ -27,8 +24,55 @@ require (
 	github.com/swaggo/gin-swagger v1.3.3
 	github.com/swaggo/swag v1.7.4
 	github.com/tealeg/xlsx v1.0.5
-	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
 	golang.org/x/image v0.0.0-20190802002840-cff245a6509b
 	gorm.io/driver/mysql v1.1.3
 	gorm.io/gorm v1.22.2
 )
+
+require (
+	github.com/KyleBanks/depth v1.2.1 // indirect
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
+	github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21 // indirect
+	github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.19.5 // indirect
+	github.com/go-openapi/spec v0.20.3 // indirect
+	github.com/go-openapi/swag v0.19.14 // indirect
+	github.com/go-sql-driver/mysql v1.6.0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/hashicorp/hcl v1.0.0 // indirect
+	github.com/jinzhu/inflection v1.0.0 // indirect
+	github.com/jinzhu/now v1.1.2 // indirect
+	github.com/jmespath/go-jmespath v0.4.0 // indirect
+	github.com/jonboulle/clockwork v0.2.2 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
+	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/lestrrat-go/strftime v1.0.5 // indirect
+	github.com/magiconair/properties v1.8.5 // indirect
+	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/mitchellh/mapstructure v1.4.2 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/pelletier/go-toml v1.9.4 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/spf13/afero v1.6.0 // indirect
+	github.com/spf13/cast v1.4.1 // indirect
+	github.com/spf13/jwalterweatherman v1.1.0 // indirect
+	github.com/spf13/pflag v1.0.5 // indirect
+	github.com/subosito/gotenv v1.2.0 // indirect
+	github.com/ugorji/go/codec v1.1.7 // indirect
+	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
+	golang.org/x/net v0.0.0-20211209124913-491a49abca63 // indirect
+	golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
+	golang.org/x/text v0.3.7 // indirect
+	golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
+	golang.org/x/tools v0.1.5 // indirect
+	google.golang.org/protobuf v1.27.1 // indirect
+	gopkg.in/ini.v1 v1.66.2 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+)

init_serve/mysql.go

@@ -25,8 +25,9 @@ const (
 	ContractRegisterOpTypeStatus     = 4 // 修改合同状态
 	ContractRegisterOpTypeDel        = 5 // 删除合同登记
 	ContractRegisterOpTypeEdit       = 6 // 合规编辑
-	ContractRegisterOpTypePreInvoice = 7 // 开票预登记
-	ContractRegisterOpTypePrePay     = 8 // 到款预登记
+	ContractRegisterOpTypePrePay     = 7 // 到款预登记
+	ContractRegisterOpTypePreInvoice = 8 // 开票预登记
+
 
 	// 合同登记开票类型
 	ContractInvoiceTypeMake    = 1 // 开票登记

models/fms/contract_income_history.go

@@ -0,0 +1,60 @@
+package fms
+
+import (
+	"hongze/fms_api/global"
+	"time"
+)
+
+type ContractIncomeHistory struct {
+	IncomeId    int       `json:"income_id" gorm:"primaryKey;column:income_id"`       //
+	Amount      float64   `json:"amount" gorm:"column:amount"`             // 开票金额
+	InvoiceTime time.Time `json:"invoice_time" gorm:"column:invoice_time"` // 开票日期/到款月
+	SellerId    int       `json:"seller_id" gorm:"column:seller_id"`       // 销售ID
+	SellerName  string    `json:"seller_name" gorm:"column:seller_name"`   // 销售名称
+	NewCompany  int       `json:"new_company" gorm:"column:new_company"`   // 是否为新客户：0-否；1-是
+	CompanyName string    `json:"company_name" gorm:"column:company_name"` // 客户名称
+}
+
+func (c *ContractIncomeHistory) List(condition string, pars []interface{}) (list []*ContractIncomeHistory, err error) {
+	list = make([]*ContractIncomeHistory, 0)
+	err = global.DEFAULT_MYSQL.Model(c).
+		Where(condition, pars...).
+		Find(&list).Error
+	return
+}
+
+func (c *ContractIncomeHistory) TableName() string {
+	return "contract_income_history"
+}
+
+// GetInvoicePaymentSummaryByRegisterIdAndInvoiceId 根据合同登记ID和开票ID获取汇总数据
+func GetIncomeHistory(condition string, pars []interface{}) (results []*IncomeSummaryItem, err error) {
+	sql := `SELECT amount,seller_name,new_company AS contract_type,company_name,invoice_time AS invoice_date FROM contract_income_history WHERE  `
+	sql += condition
+	sql += ` ORDER BY invoice_date `
+	err = global.DEFAULT_MYSQL.Raw(sql, pars...).Find(&results).Error
+	return
+}
+
+// GetInvoicePaymentSummaryByRegisterIdAndInvoiceId 根据合同登记ID和开票ID获取汇总数据
+func GetIncomeHistoryList() (results []*ContractIncomeHistory, err error) {
+	sql := `SELECT * FROM contract_income_history WHERE seller_id=0 `
+	err = global.DEFAULT_MYSQL.Raw(sql).Find(&results).Error
+	return
+}
+
+func (c *ContractIncomeHistory) Update(updateCols []string) (err error) {
+	err = global.DEFAULT_MYSQL.Model(c).Select(updateCols).Updates(c).Error
+	return
+}
+
+func GetLatestHistoryIncome(condition string, pars []interface{}) (result *ContractInvoice, err error) {
+	sql := `SELECT
+	* 
+FROM
+	contract_income_history WHERE 1=1 `
+	sql += condition
+	sql += `ORDER BY invoice_time DESC  `
+	err = global.DEFAULT_MYSQL.Raw(sql, pars...).First(&result).Error
+	return
+}

models/fms/contract_invoice.go

@@ -331,6 +331,7 @@ type InvoicePaymentCensusResp struct {
 	DataList             []*InvoicePaymentCensusItem `json:"data_list"`
 	InvoiceTotal         float64                     `json:"invoice_total" description:"开票总金额(换算后)"`
 	PaymentTotal         float64                     `json:"payment_total" description:"到款总金额(换算后)"`
+	AmountTotal          float64                     `json:"amount_total" description:"合计总金额(换算后)"`
 	InvoiceCurrencyTotal []*InvoiceListCurrencyTotal `json:"invoice_currency_total" description:"开票-分币种总金额"`
 	PaymentCurrencyTotal []*InvoiceListCurrencyTotal `json:"payment_currency_total" description:"到款-分币种总金额"`
 }
@@ -345,6 +346,7 @@ type InvoicePaymentCensusItem struct {
 	EndDate            string                      `json:"end_date" description:"合同结束日期"`
 	ServicesName       string                      `json:"services_name" description:"套餐信息字符串拼接"`
 	ContractType       int                         `json:"contract_type" description:"合同类型: 0-无 1-新签; 2-续约"`
+	ActualPayCompanies string                      `json:"actual_pay_companies" description:"该合同关联的所有代付方, 英文逗号拼接"`
 	InvoicePaymentList []*InvoicePaymentCensusInfo `json:"invoice_payment_list" description:"开票到款列表"`
 	ContractCode       string                      `gorm:"column:contract_code" json:"contract_code" description:"合同编号"`
 	ContractAmount     float64                     `gorm:"column:contract_amount" json:"contract_amount" description:"合同金额"`
@@ -434,7 +436,7 @@ func GetCensusSellerGroupInvoicePageList(page base.IPage, condition, outCond str
 			) AS b ON a.group_id = b.seller_group_id`
 	sql += ` WHERE %s ORDER BY %s LIMIT %d,%d`
 	sql = fmt.Sprintf(sql, tableName, amountSum, condition, outCond, page.GetOrderItemsString(), page.Offset(), page.GetPageSize())
-	err = global.DEFAULT_MYSQL.Raw(sql, pars).Scan(&results).Error
+	err = global.DEFAULT_MYSQL.Raw(sql, pars...).Scan(&results).Error
 	return
 }
 
@@ -601,3 +603,69 @@ func (c *ContractInvoice) FetchByRegisterId(registerId int) (items []*ContractIn
 	err = global.DEFAULT_MYSQL.Model(c).Where("is_deleted = 0 AND contract_register_id = ?", registerId).Scan(&items).Error
 	return
 }
+
+// GetDuplicateContractInvoiceDetailItemListWithType 预登记列表详情用-获取开票到款列表
+func GetDuplicateContractInvoiceDetailItemListWithType(companyName, startDate, endDate string, invoiceType int) (itemList []*ContractInvoiceDetailItem, err error) {
+	list := make([]*ContractInvoice, 0)
+	err = global.DEFAULT_MYSQL.Table("contract_invoice as a ").
+		Select(" a.* ").
+		Joins(" JOIN contract_register as b ON a.contract_register_id = b.contract_register_id ").
+		Where(fmt.Sprintf("a.is_deleted = 0 AND b.company_name = '%s' AND b.start_date= '%s' AND b.end_date= '%s' AND b.is_deleted=0 AND (a.invoice_type=3 OR a.invoice_type=4) AND a.invoice_type = %v ",companyName, startDate, endDate, invoiceType)).
+		Order("a.contract_invoice_id ASC").
+		Find(&list).Error
+	if err != nil {
+		return
+	}
+	itemList = formatContractInvoice2DetailItemList(list)
+	return
+}
+
+func GetContractInvoiceByRegisterIdAndType(registerId int) (items *ContractInvoice, err error) {
+	err = global.DEFAULT_MYSQL.Model(ContractInvoice{}).Where("is_deleted = 0 AND contract_register_id = ? AND invoice_type = 2", registerId).Order("create_time DESC").First(&items).Error
+	return
+}
+
+type DupInvoice struct {
+	ContractInvoice
+	TemplateIds string
+}
+
+// GetDuplicateContractInvoiceDetailItemList 预登记列表详情用-获取开票到款列表
+func GetDuplicateContractInvoiceDetailItemList(companyName, startDate, endDate string) (list []*DupInvoice, err error) {
+	err = global.DEFAULT_MYSQL.Table("contract_invoice as a ").
+		Select(" a.*,GROUP_CONCAT(c.service_template_id ORDER BY c.service_template_id ) AS template_ids ").
+		Joins(" JOIN contract_register as b ON a.contract_register_id = b.contract_register_id ").
+		Joins("JOIN contract_service AS c ON a.contract_register_id = c.contract_register_id").
+		Where(fmt.Sprintf("a.is_deleted = 0 AND b.company_name = '%s' AND b.start_date= '%s' AND b.end_date= '%s' AND b.is_deleted=0 AND (a.invoice_type=3 OR a.invoice_type=4) ",companyName, startDate, endDate)).
+		Group("a.contract_register_id").
+		Order("a.contract_invoice_id ASC").
+		Find(&list).Error
+	if err != nil {
+		return
+	}
+	return
+}
+
+type IncomeListReq struct {
+	SellerIds    string `json:"seller_ids" form:"seller_ids" description:"销售ID，多个ID之间用逗号拼接"`
+	StartDate    string `json:"start_date" form:"start_date" binding:"omitempty,datetime=2006-01" description:"开始日期"`
+	EndDate      string `json:"end_date" form:"end_date" binding:"omitempty,datetime=2006-01" description:"结束日期"`
+	IsExport     int    `json:"is_export" form:"is_export" description:"是否导出: 0-否; 1-是"`
+	ListParam    string    `json:"list_param" form:"list_param" description:"套餐类型: 0-月度; 1-季度; 2-半年度；3-年度；4-月度累计"`
+	CompanyType     int    `json:"company_type" form:"company_type" description:"客户类型 0全部 1新客户 2老客户"`
+}
+
+//获取最新的开票或到款日期
+func GetLatestIncome(condition string, pars []interface{}) (result *ContractInvoice, err error) {
+	sql := `SELECT
+	a.* 
+FROM
+	contract_invoice AS a
+	INNER JOIN contract_register AS b ON a.contract_register_id = b.contract_register_id 
+WHERE
+	a.is_deleted = 0 `
+	sql += condition
+	sql += `ORDER BY a.invoice_time DESC  `
+	err = global.DEFAULT_MYSQL.Raw(sql, pars...).First(&result).Error
+	return
+}

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_pre_payment.go

@@ -114,6 +114,8 @@ type PreRegisterAddReq struct {
 	RegisterType int                     `json:"register_type" description:"预登记类型 3-开票预登记 4-到款预登记"`
 	ProductIds   string                  `gorm:"column:product_ids" json:"product_ids" description:"产品ID：1-FICC; 2-权益, 如果两者都有，则用英文逗号拼接"`
 	SellerIds    string                  `json:"seller_ids" description:"CRM系统-销售ID"`
+	ContractType int                     `json:"contract_type" binding:"oneof=1 2 3 4" description:"合同类型: 1-新签; 2-续约; 3-代付; 4-补充协议"`
+	HasPayment   int                     `json:"has_payment" description:"是否有代付: 0-无; 1-有"`
 	List         []PreRegisterAddReqItem `json:"list" binding:"required" description:"预登记列表"`
 	Services     []ContractServiceAddReq `json:"services" description:"服务套餐内容"`
 }
@@ -161,6 +163,8 @@ type PreRegisterEditReq struct {
 	SellerIds          string `json:"seller_ids" description:"CRM系统-销售ID"`
 	DelInvoiceIds      []int  `json:"del_invoice_ids" description:"删除的开票到款记录ids"`
 	DelPreRegisterIds  []int  `json:"del_pre_register_ids" description:"删除的预登记记录ids"`
+	ContractType       int    `json:"contract_type" binding:"oneof=1 2 3 4" description:"合同类型: 1-新签; 2-续约; 3-代付; 4-补充协议"`
+	HasPayment         int    `json:"has_payment" description:"是否有代付: 0-无; 1-有"`
 	List               []*PreRegisterEditReqItem
 	Services           []ContractServiceAddReq `json:"services" description:"服务套餐内容"`
 }
@@ -208,6 +212,8 @@ type PreRegisterSaveReq struct {
 	RegisterType       int                      `json:"register_type" description:"预登记类型 3-开票预登记 4-到款预登记"`
 	ProductIds         string                   `gorm:"column:product_ids" json:"product_ids" description:"产品ID：1-FICC; 2-权益, 如果两者都有，则用英文逗号拼接"`
 	SellerIds          string                   `json:"seller_ids" description:"CRM系统-销售ID"`
+	ContractType       int                      `json:"contract_type" binding:"oneof=1 2 3 4" description:"合同类型: 1-新签; 2-续约; 3-代付; 4-补充协议"`
+	HasPayment         int                      `json:"has_payment" description:"是否有代付: 0-无; 1-有"`
 	List               []PreRegisterSaveReqItem `json:"list" binding:"required" description:"预登记列表"`
 	Services           []ContractServiceAddReq  `json:"services" description:"服务套餐内容"`
 }

models/fms/contract_pre_register.go

@@ -9,33 +9,41 @@ import (
 
 // PreRegister 合同开票表
 type ContractPreRegister struct {
-	PreRegisterId      int       `gorm:"primaryKey;column:pre_register_id" json:"pre_register_id" description:"预登记ID"`
-	ContractRegisterId int       `gorm:"column:contract_register_id" json:"contract_register_id" description:"登记ID"`
-	InvoiceId          int       `gorm:"column:invoice_id" json:"invoice_id" description:"开票ID"`
-	ArriveId           int       `gorm:"column:arrive_id" json:"arrive_id" description:"到款ID"`
-	CompanyName        string    `json:"company_name" description:"客户名称"`
-	Amount             float64   `gorm:"column:amount" json:"amount" description:"开票换算后的金额(人民币)"`
-	OriginAmount       float64   `gorm:"column:origin_amount" json:"origin_amount" description:"开票金额"`
-	CurrencyUnit       string    `gorm:"column:currency_unit" json:"currency_unit" description:"开票货币国际代码"`
-	ArriveAmount       float64   `gorm:"column:arrive_amount" json:"arrive_amount" description:"到款换算后的金额(人民币)"`
-	ArriveOriginAmount float64   `gorm:"column:arrive_origin_amount" json:"arrive_origin_amount" description:"到款金额"`
-	InvoiceType        int       `gorm:"column:invoice_type" json:"invoice_type" description:"类型: 1-开票登记; 2-到款登记;3-开票预登记;4-到款预登记"`
-	InvoiceDate        time.Time `gorm:"column:invoice_time" json:"invoice_time" description:"开票日"`
-	ArriveDate         time.Time `gorm:"column:arrive_time" json:"arrive_time" description:"到款日"`
-	SellerId           int       `gorm:"column:seller_id" json:"seller_id" description:"销售ID"`
-	SellerName         string    `gorm:"column:seller_name" json:"seller_name" description:"销售名称"`
-	SellerGroupId      int       `gorm:"column:seller_group_id" json:"seller_group_id" description:"销售分组ID"`
-	SellerGroupName    string    `gorm:"column:seller_group_name" json:"seller_group_name" description:"销售分组名称"`
-	SellerTeamId       int       `gorm:"column:seller_team_id" json:"seller_team_id" description:"销售小组ID"`
-	SellerTeamName     string    `gorm:"column:seller_team_name" json:"seller_team_name" description:"销售小组名称"`
-	AdminId            int       `gorm:"column:admin_id" json:"admin_id" description:"操作人ID"`
-	AdminName          string    `gorm:"column:admin_name" json:"admin_name" description:"操作人姓名"`
-	Remark             string    `gorm:"column:remark" json:"remark" description:"备注信息"`
-	ArriveRemark       string    `gorm:"column:arrive_remark" json:"arrive_remark" description:"到款备注信息"`
-	ServiceProductId   int       `gorm:"column:service_product_id" json:"service_product_id" description:"套餐类型：1ficc套餐，2权益套餐"`
-	IsPrePay           int       `gorm:"column:is_pre_pay" json:"is_pre_pay" description:"是否预付款: 0-不是; 1-是"`
-	StartDate          time.Time `gorm:"column:start_date" json:"start_date" description:"约定开始时间"`
-	EndDate            time.Time `gorm:"column:end_date" json:"end_date" description:"约定结束时间"`
+	PreRegisterId          int       `gorm:"primaryKey;column:pre_register_id" json:"pre_register_id" description:"预登记ID"`
+	ContractRegisterId     int       `gorm:"column:contract_register_id" json:"contract_register_id" description:"登记ID"`
+	InvoiceId              int       `gorm:"column:invoice_id" json:"invoice_id" description:"开票ID"`
+	ArriveId               int       `gorm:"column:arrive_id" json:"arrive_id" description:"到款ID"`
+	CompanyName            string    `json:"company_name" description:"客户名称"`
+	Amount                 float64   `gorm:"column:amount" json:"amount" description:"开票换算后的金额(人民币)"`
+	OriginAmount           float64   `gorm:"column:origin_amount" json:"origin_amount" description:"开票金额"`
+	CurrencyUnit           string    `gorm:"column:currency_unit" json:"currency_unit" description:"开票货币国际代码"`
+	ArriveAmount           float64   `gorm:"column:arrive_amount" json:"arrive_amount" description:"到款换算后的金额(人民币)"`
+	ArriveOriginAmount     float64   `gorm:"column:arrive_origin_amount" json:"arrive_origin_amount" description:"到款金额"`
+	InvoiceType            int       `gorm:"column:invoice_type" json:"invoice_type" description:"类型: 1-开票登记; 2-到款登记;3-开票预登记;4-到款预登记"`
+	InvoiceDate            time.Time `gorm:"column:invoice_time" json:"invoice_time" description:"开票日"`
+	ArriveDate             time.Time `gorm:"column:arrive_time" json:"arrive_time" description:"到款日"`
+	SellerId               int       `gorm:"column:seller_id" json:"seller_id" description:"销售ID"`
+	SellerName             string    `gorm:"column:seller_name" json:"seller_name" description:"销售名称"`
+	SellerGroupId          int       `gorm:"column:seller_group_id" json:"seller_group_id" description:"销售分组ID"`
+	SellerGroupName        string    `gorm:"column:seller_group_name" json:"seller_group_name" description:"销售分组名称"`
+	SellerTeamId           int       `gorm:"column:seller_team_id" json:"seller_team_id" description:"销售小组ID"`
+	SellerTeamName         string    `gorm:"column:seller_team_name" json:"seller_team_name" description:"销售小组名称"`
+	AdminId                int       `gorm:"column:admin_id" json:"admin_id" description:"操作人ID"`
+	AdminName              string    `gorm:"column:admin_name" json:"admin_name" description:"操作人姓名"`
+	Remark                 string    `gorm:"column:remark" json:"remark" description:"备注信息"`
+	ArriveRemark           string    `gorm:"column:arrive_remark" json:"arrive_remark" description:"到款备注信息"`
+	ServiceProductId       int       `gorm:"column:service_product_id" json:"service_product_id" description:"套餐类型：1ficc套餐，2权益套餐"`
+	IsPrePay               int       `gorm:"column:is_pre_pay" json:"is_pre_pay" description:"是否预付款: 0-不是; 1-是"`
+	StartDate              time.Time `gorm:"column:start_date" json:"start_date" description:"约定开始时间"`
+	EndDate                time.Time `gorm:"column:end_date" json:"end_date" description:"约定结束时间"`
+	ContractType           int       `gorm:"column:contract_type" json:"contract_type" description:"合同类型: 1-新签; 2-续约; 3-代付; 4-补充协议"`
+	HasPayment             int       `gorm:"column:has_payment" json:"has_payment" description:"是否有代付: 0-无; 1-有"`
+	PaymentSellerId        int       `gorm:"column:payment_seller_id;default:0;NOT NULL" json:"payment_seller_id"`             // 销售ID
+	PaymentSellerName      string    `gorm:"column:payment_seller_name;NOT NULL" json:"payment_seller_name"`                   // 销售名称
+	PaymentSellerGroupId   int       `gorm:"column:payment_seller_group_id;default:0;NOT NULL" json:"payment_seller_group_id"` // 销售分组ID
+	PaymentSellerGroupName string    `gorm:"column:payment_seller_group_name;NOT NULL" json:"payment_seller_group_name"`       // 销售分组名称
+	PaymentSellerTeamId    int       `gorm:"column:payment_seller_team_id;default:0;NOT NULL" json:"payment_seller_team_id"`   // 销售小组ID
+	PaymentSellerTeamName  string    `gorm:"column:payment_seller_team_name;NOT NULL" json:"payment_seller_team_name"`         // 销售小组名称
 	base.TimeBase
 }
 
@@ -45,31 +53,39 @@ func (c *ContractPreRegister) TableName() string {
 
 // ContractPreRegisterItem 合同开票/到款
 type ContractPreRegisterItem struct {
-	PreRegisterId      int     `gorm:"primaryKey;column:pre_register_id" json:"pre_register_id" description:"预登记ID"`
-	ContractRegisterId int     `gorm:"column:contract_register_id" json:"contract_register_id" description:"登记ID"`
-	InvoiceId          int     `gorm:"column:invoice_id" json:"invoice_id" description:"开票ID"`
-	ArriveId           int     `gorm:"column:arrive_id" json:"arrive_id" description:"到款ID"`
-	CompanyName        string  `json:"company_name" description:"客户名称"`
-	Amount             float64 `gorm:"column:amount" json:"amount" description:"开票换算后的金额(人民币)"`
-	OriginAmount       float64 `gorm:"column:origin_amount" json:"origin_amount" description:"开票金额"`
-	CurrencyUnit       string  `gorm:"column:currency_unit" json:"currency_unit" description:"开票货币国际代码"`
-	ArriveAmount       float64 `gorm:"column:arrive_amount" json:"arrive_amount" description:"到款换算后的金额(人民币)"`
-	ArriveOriginAmount float64 `gorm:"column:arrive_origin_amount" json:"arrive_origin_amount" description:"到款金额"`
-	UnitName           string  `json:"unit_name" description:"货币单位名称"`
-	InvoiceType        int     `gorm:"column:invoice_type" json:"invoice_type" description:"类型: 1-开票登记; 2-到款登记;3-开票预登记;4-到款预登记"`
-	InvoiceDate        string  `gorm:"column:invoice_time" json:"invoice_time" description:"开票日"`
-	ArriveDate         string  `gorm:"column:arrive_time" json:"arrive_time" description:"到款日"`
-	SellerId           int     `gorm:"column:seller_id" json:"seller_id" description:"销售ID"`
-	SellerName         string  `gorm:"column:seller_name" json:"seller_name" description:"销售名称"`
-	PayType            int     `gorm:"column:pay_type" json:"pay_type" description:"付款方式：0-无；1-年付；2-半年付；3-季付；4-次付；5-异常"`
-	Remark             string  `gorm:"column:remark" json:"remark" description:"开票备注信息"`
-	ArriveRemark       string  `gorm:"column:arrive_remark" json:"arrive_remark" description:"到款备注信息"`
-	ServiceProductId   int     `gorm:"column:service_product_id" json:"service_product_id" description:"套餐类型：1ficc套餐，2权益套餐"`
-	IsPrePay           int     `gorm:"column:is_pre_pay" json:"is_pre_pay" description:"是否预付款: 0-不是; 1-是"`
-	StartDate          string  `gorm:"column:start_date" json:"start_date" description:"约定开始时间"`
-	EndDate            string  `gorm:"column:end_date" json:"end_date" description:"约定结束时间"`
-	AdminId            int     `gorm:"column:admin_id" json:"admin_id" description:"操作人ID"`
-	CreateTime         string  `gorm:"column:create_time" json:"create_time" description:"创建时间"`
+	PreRegisterId          int     `gorm:"primaryKey;column:pre_register_id" json:"pre_register_id" description:"预登记ID"`
+	ContractRegisterId     int     `gorm:"column:contract_register_id" json:"contract_register_id" description:"登记ID"`
+	InvoiceId              int     `gorm:"column:invoice_id" json:"invoice_id" description:"开票ID"`
+	ArriveId               int     `gorm:"column:arrive_id" json:"arrive_id" description:"到款ID"`
+	CompanyName            string  `json:"company_name" description:"客户名称"`
+	Amount                 float64 `gorm:"column:amount" json:"amount" description:"开票换算后的金额(人民币)"`
+	OriginAmount           float64 `gorm:"column:origin_amount" json:"origin_amount" description:"开票金额"`
+	CurrencyUnit           string  `gorm:"column:currency_unit" json:"currency_unit" description:"开票货币国际代码"`
+	ArriveAmount           float64 `gorm:"column:arrive_amount" json:"arrive_amount" description:"到款换算后的金额(人民币)"`
+	ArriveOriginAmount     float64 `gorm:"column:arrive_origin_amount" json:"arrive_origin_amount" description:"到款金额"`
+	UnitName               string  `json:"unit_name" description:"货币单位名称"`
+	InvoiceType            int     `gorm:"column:invoice_type" json:"invoice_type" description:"类型: 1-开票登记; 2-到款登记;3-开票预登记;4-到款预登记"`
+	InvoiceDate            string  `gorm:"column:invoice_time" json:"invoice_time" description:"开票日"`
+	ArriveDate             string  `gorm:"column:arrive_time" json:"arrive_time" description:"到款日"`
+	SellerId               int     `gorm:"column:seller_id" json:"seller_id" description:"销售ID"`
+	SellerName             string  `gorm:"column:seller_name" json:"seller_name" description:"销售名称"`
+	PayType                int     `gorm:"column:pay_type" json:"pay_type" description:"付款方式：0-无；1-年付；2-半年付；3-季付；4-次付；5-异常"`
+	Remark                 string  `gorm:"column:remark" json:"remark" description:"开票备注信息"`
+	ArriveRemark           string  `gorm:"column:arrive_remark" json:"arrive_remark" description:"到款备注信息"`
+	ServiceProductId       int     `gorm:"column:service_product_id" json:"service_product_id" description:"套餐类型：1ficc套餐，2权益套餐"`
+	IsPrePay               int     `gorm:"column:is_pre_pay" json:"is_pre_pay" description:"是否预付款: 0-不是; 1-是"`
+	StartDate              string  `gorm:"column:start_date" json:"start_date" description:"约定开始时间"`
+	EndDate                string  `gorm:"column:end_date" json:"end_date" description:"约定结束时间"`
+	AdminId                int     `gorm:"column:admin_id" json:"admin_id" description:"操作人ID"`
+	CreateTime             string  `gorm:"column:create_time" json:"create_time" description:"创建时间"`
+	ContractType           int     `json:"contract_type" binding:"oneof=1 2 3 4" description:"合同类型: 1-新签; 2-续约; 3-代付; 4-补充协议"`
+	HasPayment             int     `json:"has_payment" description:"是否有代付: 0-无; 1-有"`
+	PaymentSellerId        int     `gorm:"column:payment_seller_id;default:0;NOT NULL" json:"payment_seller_id"`             // 销售ID
+	PaymentSellerName      string  `gorm:"column:payment_seller_name;NOT NULL" json:"payment_seller_name"`                   // 销售名称
+	PaymentSellerGroupId   int     `gorm:"column:payment_seller_group_id;default:0;NOT NULL" json:"payment_seller_group_id"` // 销售分组ID
+	PaymentSellerGroupName string  `gorm:"column:payment_seller_group_name;NOT NULL" json:"payment_seller_group_name"`       // 销售分组名称
+	PaymentSellerTeamId    int     `gorm:"column:payment_seller_team_id;default:0;NOT NULL" json:"payment_seller_team_id"`   // 销售小组ID
+	PaymentSellerTeamName  string  `gorm:"column:payment_seller_team_name;NOT NULL" json:"payment_seller_team_name"`         // 销售小组名称
 }
 
 // formatContractInvoice2Item 格式化ContractInvoiceItem
@@ -98,6 +114,14 @@ func formatContractPreRegister2Item(item *ContractPreRegister) (formatItem *Cont
 	formatItem.CreateTime = utils.TimeTransferString(utils.FormatDateTime, item.CreateTime)
 	formatItem.StartDate = item.StartDate.Format(utils.FormatDate)
 	formatItem.EndDate = item.EndDate.Format(utils.FormatDate)
+	formatItem.PaymentSellerId = item.PaymentSellerId
+	formatItem.PaymentSellerName = item.PaymentSellerName
+	formatItem.PaymentSellerGroupId = item.PaymentSellerGroupId
+	formatItem.PaymentSellerGroupName = item.PaymentSellerGroupName
+	formatItem.PaymentSellerTeamId = item.PaymentSellerTeamId
+	formatItem.PaymentSellerTeamName = item.PaymentSellerTeamName
+	formatItem.ContractType = item.ContractType
+	formatItem.HasPayment = item.HasPayment
 	return
 }
 
@@ -191,7 +215,8 @@ func formatContractPreRegister2ItemList(list []*ContractPreRegister) (itemList [
 // ContractPreRegisterList 预登记列表
 type ContractPreRegisterList struct {
 	*ContractPreRegisterItem
-	ServicesName string `json:"services" description:"套餐名称"`
+	ServicesName       string `json:"services" description:"套餐名称"`
+	ContractTypeString string `json:"contract_type_string" description:"合同类型"`
 }
 
 // PreRegisterDetailReq 预登记详情请求体
@@ -201,6 +226,7 @@ type PreRegisterDetailReq struct {
 	PreRegisterId      int `gorm:"column:pre_register_id" json:"pre_register_id" description:"预登记ID"`
 	InvoiceId          int `gorm:"column:invoice_id" json:"invoice_id" description:"开票ID"`
 	ArriveId           int `gorm:"column:arrive_id" json:"arrive_id" description:"到款ID"`
+	DetailType         int `json:"detail_type" description:"请求类型"`
 }
 
 // ContractPreRegisterDetail 预登记详情

models/fms/contract_register.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"hongze/fms_api/global"
 	"hongze/fms_api/models/base"
+	"hongze/fms_api/models/crm"
 	"hongze/fms_api/utils"
 	"time"
 )
@@ -563,7 +564,7 @@ type CheckContractNameResp struct {
 
 // UpdateContractPreRegister 更新合同预登记
 func UpdateContractPreRegister(item *ContractRegister, updateCols []string, serviceDetail []*ContractServiceAndDetail,
-	invoiceList []*ContractInvoice, invoiceUpdateCols []string, delInvoiceIds, delPreRegisterIds []int, ppList []*ContractPreRegister) (err error) {
+	invoiceList []*ContractInvoice, invoiceUpdateCols []string, delInvoiceIds, delPreRegisterIds []int, ppList []*ContractPreRegister, sellerItem *crm.SellerAdminWithGroupTeam, registerType int) (err error) {
 	tx := global.DEFAULT_MYSQL.Begin()
 	defer func() {
 		if err != nil {
@@ -615,6 +616,8 @@ func UpdateContractPreRegister(item *ContractRegister, updateCols []string, serv
 	}
 
 	for i := range invoiceList {
+		fmt.Println("invoiceList[i].SellerName",invoiceList[i].SellerName)
+		fmt.Println("invoiceList[i].SellerId",invoiceList[i].SellerId)
 		if invoiceList[i].ContractInvoiceId == 0 {
 			if e := invoiceList[i].Create(); e != nil {
 				err = e
@@ -653,8 +656,39 @@ func UpdateContractPreRegister(item *ContractRegister, updateCols []string, serv
 		StartDate:          item.StartDate,
 		EndDate:            item.EndDate,
 		CurrencyUnit:       item.CurrencyUnit,
-	}
-	tx.Model(&invoiceItem).Select([]string{"StartDate", "EndDate", "CurrencyUnit"}).Where("ContractRegisterId", item.ContractRegisterId).Updates(invoiceItem)
+		SellerId:           sellerItem.SellerId,
+		SellerName:         sellerItem.SellerName,
+		SellerGroupId:      sellerItem.GroupId,
+		SellerGroupName:    sellerItem.GroupName,
+		SellerTeamId:       sellerItem.TeamId,
+		SellerTeamName:     sellerItem.TeamName,
+	}
+	if registerType == 3{
+		tx.Model(&invoiceItem).Select([]string{"StartDate", "EndDate", "CurrencyUnit","SellerId",
+			"SellerName","SellerGroupId","SellerGroupName","SellerTeamId","SellerTeamName"}).Where("contract_register_id = ? AND invoice_type = 4", item.ContractRegisterId).Updates(invoiceItem)
+	} else {
+		tx.Model(&invoiceItem).Select([]string{"StartDate", "EndDate", "CurrencyUnit"}).Where("contract_register_id", item.ContractRegisterId).Updates(invoiceItem)
+	}
+
+	//pp := &ContractPreRegister{}
+	//ppItem, e := pp.Fetch(ppList[0].PreRegisterId)
+	//if e != nil {
+	//	err = e
+	//}
+	//otherInvoiceItem := ContractInvoice{}
+	//if ppList[0].InvoiceType == ContractInvoiceTypePreMake {
+	//	otherInvoiceItem.ContractInvoiceId = ppItem.ArriveId
+	//	if ppItem.ArriveId > 0 {
+	//		//如果是开票类型，那么更新预登记里的预到款销售信息
+	//		otherInvoiceItem.SellerId = invoiceList[0].SellerId
+	//		otherInvoiceItem.SellerName = invoiceList[0].SellerName
+	//		otherInvoiceItem.SellerGroupId = invoiceList[0].SellerGroupId
+	//		otherInvoiceItem.SellerGroupName = invoiceList[0].SellerGroupName
+	//		otherInvoiceItem.SellerTeamId = invoiceList[0].SellerTeamId
+	//		otherInvoiceItem.SellerTeamName = invoiceList[0].SellerTeamName
+	//	}
+	//	tx.Model(&otherInvoiceItem).Select([]string{"SellerId", "SellerName", "SellerGroupId","SellerGroupName","SellerTeamId","SellerTeamName"}).Updates(otherInvoiceItem)
+	//}
 
 	//删除
 	if len(delInvoiceIds) > 0 {
@@ -735,6 +769,34 @@ func UpdateContractRegisterPre(item *ContractRegister, updateCols []string, serv
 		productId = invoiceList[0].ServiceProductId
 	}
 
+	pp := &ContractPreRegister{}
+	ppItem, e := pp.Fetch(ppList[0].PreRegisterId)
+	if e != nil {
+		err = e
+	}
+	//更新同一预登记记录下的productid
+	otherInvoiceItem := ContractInvoice{
+		ServiceProductId: productId,
+	}
+	if ppList[0].InvoiceType == ContractInvoiceTypePreMake {
+		otherInvoiceItem.ContractInvoiceId = ppItem.ArriveId
+		if ppItem.ArriveId > 0 {
+			//如果是开票类型，那么更新预登记里的预到款销售信息
+			otherInvoiceItem.SellerId = invoiceList[0].SellerId
+			otherInvoiceItem.SellerName = invoiceList[0].SellerName
+			otherInvoiceItem.SellerGroupId = invoiceList[0].SellerGroupId
+			otherInvoiceItem.SellerGroupName = invoiceList[0].SellerGroupName
+			otherInvoiceItem.SellerTeamId = invoiceList[0].SellerTeamId
+			otherInvoiceItem.SellerTeamName = invoiceList[0].SellerTeamName
+		}
+		tx.Model(&otherInvoiceItem).Select([]string{"ServiceProductId","SellerId", "SellerName", "SellerGroupId","SellerGroupName","SellerTeamId","SellerTeamName"}).Updates(otherInvoiceItem)
+	} else {
+		otherInvoiceItem.ContractInvoiceId = ppItem.InvoiceId
+		tx.Model(&otherInvoiceItem).Select([]string{"ServiceProductId"}).Updates(otherInvoiceItem)
+	}
+
+
+
 	//更新另一类型的invoice表数据
 	invoiceItem := ContractInvoice{
 		ContractRegisterId: item.ContractRegisterId,
@@ -779,23 +841,6 @@ func UpdateContractRegisterPre(item *ContractRegister, updateCols []string, serv
 		}
 	}
 
-	pp := &ContractPreRegister{}
-	ppItem, e := pp.Fetch(ppList[0].PreRegisterId)
-	if e != nil {
-		err = e
-	}
-	//更新同一预登记记录下的productid
-	otherInvoiceItem := ContractInvoice{
-		ServiceProductId: productId,
-	}
-	if ppList[0].InvoiceType == 3 {
-		otherInvoiceItem.ContractInvoiceId = ppItem.ArriveId
-	} else {
-		otherInvoiceItem.ContractInvoiceId = ppItem.InvoiceId
-	}
-
-	tx.Model(&otherInvoiceItem).Select([]string{"ServiceProductId"}).Updates(otherInvoiceItem)
-
 	return
 }
 
@@ -863,3 +908,33 @@ func UpdateSupplementContractPreRegister(item *ContractRegister, serviceAmountLi
 
 	return
 }
+
+type CheckContractDuplicateReq struct {
+	CompanyName string                  `json:"company_name" form:"company_name" description:"客户名称"`
+	StartDate   string                  `json:"start_date" form:"start_date" description:"合同开始日期"`
+	EndDate     string                  `json:"end_date" form:"end_date" description:"合同结束日期"`
+	Services    []ContractServiceAddReq `json:"services" description:"服务套餐内容"`
+}
+
+func CheckContractDuplicate(condition string, pars []interface{}) (list []*ContractRegister,err error) {
+	query := global.DEFAULT_MYSQL.Table("contract_register AS a").
+		Select("a.* ").
+		Joins(" JOIN contract_service AS b ON a.contract_register_id = b.contract_register_id ").
+		Where(condition, pars...).
+		Group("a.contract_register_id")
+	err = query.Find(&list).Error
+	return
+}
+
+
+type CheckContractDuplicateResp struct {
+	Exist int `json:"exist" description:"是否存在重复的合同：0不存在，1存在"`
+}
+
+func CheckContractServiceDuplicate(registerIds []int) (ids []*string, err error) {
+	err = global.DEFAULT_MYSQL.Table("contract_service").
+		Select("GROUP_CONCAT(service_template_id ORDER BY service_template_id)  AS ids ").
+		Where("contract_register_id IN (?)", registerIds).
+		Group("contract_register_id").Scan(&ids).Error
+	return
+}

models/fms/contract_register_log.go

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

models/fms/currency_unit.go

@@ -101,8 +101,8 @@ type InvoicePaymentSummaryItem struct {
 // 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", "c.seller_id", "c.seller_name", "c.seller_group_id",
-		"c.seller_group_name", "d.origin_amount AS payment_amount", "d.invoice_time AS payment_date", "d.pay_type",
+		"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",
 	}
 	query := global.DEFAULT_MYSQL.Table("invoice_payment_summary AS a").
 		Select(strings.Join(fields, ",")).
@@ -169,6 +169,63 @@ func DeleteInvoicePaymentSummaryByInvoiceIdAndPaymentId(invoiceId, arriveId, reg
 	return
 }
 
+// GetContractSummaryInvoicePaymentAmount 获取汇总金额合计信息
+func GetContractSummaryInvoicePaymentAmount(condition string, pars []interface{}) (amountTotal float64, err error) {
+	query := global.DEFAULT_MYSQL.Table("invoice_payment_summary AS a").
+		Select("IF(a.invoice_id=0,d.amount, b.amount) AS amount").
+		Joins("LEFT JOIN contract_invoice AS b ON a.invoice_id = b.contract_invoice_id AND b.is_deleted = 0 ").
+		Joins("LEFT JOIN contract_invoice AS d ON a.payment_id = d.contract_invoice_id AND d.is_deleted = 0").
+		Where(condition, pars...).Group("id")
+	nq := global.DEFAULT_MYSQL.Table("(?) AS e", query).
+		Select(" IFNULL( SUM( e.amount ), 0 ) ")
+
+	err = nq.Find(&amountTotal).Error
+	return
+}
+
+// GetInvoicePaymentSummaryByRegisterIdAndInvoiceId 根据合同登记ID和开票ID获取汇总数据
+func GetInvoicePaymentSummaryByRegisterIdAndInvoiceId(registerId, invocieId int) (results []*ContractRegisterSummary, err error) {
+	sql := `SELECT * FROM invoice_payment_summary WHERE register_id = ? AND invoice_id= ? `
+	err = global.DEFAULT_MYSQL.Exec(sql, registerId, invocieId).Find(&results).Error
+	return
+}
+
+type IncomeSummaryItem struct {
+	CompanyName string    `json:"company_name" description:"客户名称"`
+	ContractType  int       `json:"contract_type" description:"是否为新客户: 2-否; 1-是"`
+	InvoiceDate time.Time `json:"invoice_time" description:"开票日期"`
+	Amount      float64   `json:"amount" description:"金额"`
+	SellerName  string    `json:"seller_name" description:"销售名称"`
+}
+
+// GetContractSummaryIncomeAmount 获取汇总金额合计信息
+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,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").
+		Joins("LEFT JOIN contract_invoice AS b ON a.invoice_id = b.contract_invoice_id AND b.is_deleted = 0 ").
+		Joins("LEFT JOIN contract_invoice AS d ON a.payment_id = d.contract_invoice_id AND d.is_deleted = 0").
+		Joins("JOIN contract_register AS c ON a.register_id = c.contract_register_id AND c.is_deleted = 0").
+		Where(condition, pars...).Group("id").Order("invoice_date ")
+	//nq := global.DEFAULT_MYSQL.Table("(?) AS e", query).
+	//	Select(" IFNULL( SUM( e.amount ), 0 ) ")
+
+	err = query.Find(&results).Error
+	return
+}
+
+type IncomeSummaryItemList []*IncomeSummaryItem
+
+func (c IncomeSummaryItemList) Len() int {
+	return len(c)
+}
+
+func (c IncomeSummaryItemList) Less(i, j int) bool {
+	return c[i].InvoiceDate.Before(c[j].InvoiceDate)
+}
+
+func (c IncomeSummaryItemList) Swap(i, j int) {
+	c[i], c[j] = c[j], c[i]
+}
 type InvoiceSummary struct {
 	SummaryId           int     `json:"summary_id" description:"汇总ID"`
 	ContractAmountCount float64 `gorm:"column:contract_amount_count" json:"contract_amount_count" description:"合同金额"`
@@ -231,4 +288,4 @@ type NotInvoicePaymentCensusResp struct {
 	PaymentCurrencyTotal    []*InvoiceListCurrencyTotal `json:"payment_currency_total" description:"到款-分币种总金额"`
 	NotInvoiceTotal         float64                     `json:"not_invoice_total" description:"未开票总金额(换算后)"`
 	NotInvoiceCurrencyTotal []*InvoiceListCurrencyTotal `json:"not_invoice_currency_total" description:"未开票-分币种总金额"`
-}
+}

models/statistic.go

@@ -2,6 +2,7 @@ package models
 
 import (
 	"hongze/fms_api/global"
+	"hongze/fms_api/models/fms"
 )
 
 // 收入统计图表数据
@@ -19,9 +20,19 @@ type IncomeItem struct {
 
 func GetIncomeListCount(cond string) (results *IncomeItem, err error) {
 	sql := `SELECT a.contract_money, b.arrival_money FROM (
-SELECT SUM(amount) contract_money  FROM contract_invoice  WHERE is_deleted = 0 AND (invoice_type = 1 OR invoice_type = 3) `+cond+` ) AS a,
-(SELECT SUM(amount) arrival_money FROM  contract_invoice  WHERE is_deleted = 0 AND (invoice_type = 2 OR invoice_type = 4) `+cond+` ) AS b WHERE 1=1 `
+SELECT SUM(amount) contract_money  FROM contract_invoice  WHERE is_deleted = 0 AND (invoice_type = 1 OR invoice_type = 3) ` + cond + ` ) AS a,
+(SELECT SUM(amount) arrival_money FROM  contract_invoice  WHERE is_deleted = 0 AND (invoice_type = 2 OR invoice_type = 4) ` + cond + ` ) AS b WHERE 1=1 `
 
 	err = global.DEFAULT_MYSQL.Raw(sql).First(&results).Error
 	return
 }
+
+// 收入统计图表数据
+type CensusIncomeChartResp struct {
+	Title          string                   `description:"图表名称"`
+	Date           []string                 `description:"月份"`
+	TotalMoney     []float64                `description:"总金额"`
+	PrevTotalMoney []float64                `description:"历史总金额"`
+	Yoy            []string                 `description:"同比值"`
+	DataList       []*fms.IncomeSummaryItem ` json:"-"`
+}

models/system/sys_admin.go

@@ -13,6 +13,7 @@ func InitCensus(rg *gin.RouterGroup) {
 	invGroup.GET("list", inv.List)
 	invGroup.GET("not_invoice/list", inv.NotInvoiceList)
 	invGroup.GET("not_payment/list", inv.NotPaymentList)
+	invGroup.GET("income/list", inv.IncomeList)
 
 
 	// 销售

routers/contract.go

@@ -23,6 +23,7 @@ func InitContract(rg *gin.RouterGroup) {
 	crGroup.POST("import", cr.Import)
 	crGroup.GET("currency_list", cr.CurrencyList)
 	crGroup.GET("check_contract_code", cr.CheckContractName)
+	crGroup.POST("check_contract_duplicate", cr.CheckContractDuplicate)
 
 	// 合同套餐
 	sr := new(contract.ServiceController)

routers/crm.go

@@ -20,4 +20,5 @@ func InitCrm(rg *gin.RouterGroup) {
 	slGroup.GET("list", sl.List)
 	slGroup.GET("group_list", sl.GroupList)
 	slGroup.GET("all_list", sl.AllList)
+	slGroup.GET("team_list", sl.TeamList)
 }

routers/resource.go

@@ -2,6 +2,7 @@ package crm
 
 import (
 	"errors"
+	"fmt"
 	"hongze/fms_api/models/crm"
 )
 
@@ -91,7 +92,7 @@ func GetSellerTeamGroupMap() (teamGroupMap map[int]*crm.SysGroup, err error) {
 }
 
 
-// GetSellerDepartmentList 获取销售部门列表-包含大组和小组
+// GetSellerDepartmentList 获取销售部门列表-大组
 func GetSellerDepartmentList() (resp crm.SellerAdminWithGroupList, err error) {
 	// 获取组别列表
 	departmentIds := []int{crm.SellerDepartmentId,crm.RaiSellerDepartmentId}
@@ -115,7 +116,7 @@ func GetSellerDepartmentList() (resp crm.SellerAdminWithGroupList, err error) {
 	}
 
 	// 获取销售部门所有销售信息
-	adminCond := "department_id in (?) AND enabled = 1"
+	adminCond := "department_id in (?) "
 	adminPars := make([]interface{}, 0)
 	adminPars = append(adminPars, departmentIds)
 	adminOB := new(crm.Admin)
@@ -126,6 +127,7 @@ func GetSellerDepartmentList() (resp crm.SellerAdminWithGroupList, err error) {
 	}
 
 	// 销售列表
+	departmentMap := make(map[int][]crm.SellerAdminWithGroupTree)
 	groupSeller := make(map[int][]crm.SellerAdminWithGroupTree)
 	ficcList := make([]crm.SellerAdminList, 0)
 	raiList := make([]crm.SellerAdminList, 0)
@@ -148,6 +150,7 @@ func GetSellerDepartmentList() (resp crm.SellerAdminWithGroupList, err error) {
 				}
 				groupSeller[g.GroupId] = append(groupSeller[g.GroupId], tmp)
 			}else{
+				fmt.Println("adminList[i]:",adminList[i].AdminId)
 				err = errors.New("找不到对应的销售分组")
 				return
 			}
@@ -160,13 +163,16 @@ func GetSellerDepartmentList() (resp crm.SellerAdminWithGroupList, err error) {
 				}
 				groupSeller[g.GroupId] = append(groupSeller[g.GroupId], tmp)
 			}else{
-				err = errors.New("找不到对应的销售分组")
-				return
+				tmp := crm.SellerAdminWithGroupTree{
+					SellerId:    adminList[i].AdminId,
+					SellerName:  adminList[i].RealName,
+					Child: nil,
+				}
+				departmentMap[adminList[i].DepartmentId] = append(departmentMap[adminList[i].DepartmentId], tmp)
 			}
 		}
 	}
 	//分组
-	departmentMap := make(map[int][]crm.SellerAdminWithGroupTree)
 	for k, v := range groupMap {
 		child, _ := groupSeller[k]
 		tmp := crm.SellerAdminWithGroupTree{
@@ -264,3 +270,119 @@ func GetSellerDepartmentListWithGroupAndTeamByDepartment() (ficcList []*crm.Sell
 	}
 	return
 }
+
+// GetSellerList 获取销售部门列表-大组和小组
+func GetSellerList() (resp crm.SellerAdminWithGroupList, err error) {
+	// 获取组别列表
+	departmentIds := []int{crm.SellerDepartmentId,crm.RaiSellerDepartmentId}
+	groupCond := "department_id in (?)"
+	groupPars := make([]interface{}, 0)
+	groupPars = append(groupPars, departmentIds)
+	groupOB := new(crm.SysGroup)
+	fullGroups, e := groupOB.List(groupCond, groupPars)
+	if e != nil {
+		err = errors.New("获取组别列表失败, Err: " + e.Error())
+		return
+	}
+	fullGroupMap := make(map[int]*crm.SysGroup)
+	for _, v := range fullGroups{
+		fullGroupMap[v.GroupId] = v
+	}
+	// 获取销售部门所有销售信息
+	adminCond := "department_id in (?) "
+	adminPars := make([]interface{}, 0)
+	adminPars = append(adminPars, departmentIds)
+	adminOB := new(crm.Admin)
+	adminList, e := adminOB.List(adminCond, adminPars)
+	if e != nil {
+		err = errors.New("获取销售列表失败, Err: " + e.Error())
+		return
+	}
+
+	var listGroup []crm.SellerAdminWithGroupTree
+	//var listDepartment []crm.SellerAdminWithGroupTree
+	departmentListMap := make(map[int][]crm.SellerAdminWithGroupTree)
+	groupListMap := make(map[int][]crm.SellerAdminWithGroupTree)
+	teamListMap := make(map[int][]crm.SellerAdminWithGroupTree)
+	//departmentHasMap := make(map[int]bool)
+	groupHasMap  := make(map[int]bool)
+	teamHasMap := make(map[int]bool)
+
+	for _, v := range adminList {
+		tmp := crm.SellerAdminWithGroupTree{
+			SellerId:    v.AdminId,
+			SellerName:  v.RealName,
+		}
+		if v.GroupId > 0 {
+			if groupInfo, ok := fullGroupMap[v.GroupId]; ok {
+				if groupInfo.ParentId > 0 {
+					teamListMap[v.GroupId] = append(teamListMap[v.GroupId], tmp)
+				}else{
+					groupListMap[groupInfo.GroupId] = append(groupListMap[groupInfo.GroupId], tmp)
+				}
+			}else {
+				departmentListMap[v.DepartmentId] = append(departmentListMap[v.DepartmentId], tmp)
+			}
+		}else if v.DepartmentId > 0{
+			departmentListMap[v.DepartmentId] = append(departmentListMap[v.DepartmentId], tmp)
+		}
+	}
+	for _, groupInfo := range fullGroups {
+		var team1 crm.SellerAdminWithGroupTree
+		//处理小组
+		if groupInfo.ParentId > 0 {
+			if _, ok2 :=teamHasMap[groupInfo.GroupId]; !ok2 {
+				if len(teamListMap[groupInfo.GroupId]) > 0 {
+					team1 = crm.SellerAdminWithGroupTree{
+						SellerId:    groupInfo.GroupId,
+						SellerName:  groupInfo.GroupName,
+						Child: teamListMap[groupInfo.GroupId],
+					}
+					teamHasMap[groupInfo.GroupId] = true
+					groupListMap[groupInfo.ParentId] = append(groupListMap[groupInfo.ParentId], team1)
+				}
+			}
+		}
+	}
+	for _, groupInfo := range fullGroups {
+		var group1 crm.SellerAdminWithGroupTree
+		//处理大组
+		if groupInfo.ParentId == 0 {
+			if _, ok2 :=groupHasMap[groupInfo.GroupId]; !ok2 {
+				if len(groupListMap[groupInfo.GroupId]) > 0 {
+					group1 = crm.SellerAdminWithGroupTree{
+						SellerId:    groupInfo.GroupId,
+						SellerName:  groupInfo.GroupName,
+						Child: groupListMap[groupInfo.GroupId],
+					}
+					groupHasMap[groupInfo.GroupId] = true
+					departmentListMap[groupInfo.DepartmentId] = append(departmentListMap[groupInfo.DepartmentId], group1)
+					listGroup = append(listGroup, group1)
+				}
+			}
+		}
+	}
+
+
+	//分部门
+	allTitleMap := map[int]string{
+		crm.SellerDepartmentId:"FICC销售",
+		crm.RaiSellerDepartmentId:"权益销售",
+	}
+	tmp1 := crm.SellerAdminWithGroupTree{
+		SellerId:   crm.SellerDepartmentId,
+		SellerName: allTitleMap[crm.SellerDepartmentId],
+		Child:      departmentListMap[crm.SellerDepartmentId],
+	}
+	tmp2 := crm.SellerAdminWithGroupTree{
+		SellerId:   crm.RaiSellerDepartmentId,
+		SellerName: allTitleMap[crm.RaiSellerDepartmentId],
+		Child:       departmentListMap[crm.RaiSellerDepartmentId],
+	}
+	allList := make([]crm.SellerAdminWithGroupTree, 0)
+	allList = append(allList, tmp1)
+	allList = append(allList, tmp2)
+	resp.AllList = allList
+
+	return
+}

services/crm/contract.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)
 		}

services/fms/currency_rate.go

@@ -416,8 +416,7 @@ func TimeToTimestamp() {
 
 func TimeTransferString(format string, t time.Time) string {
 	str := t.Format(format)
-	var emptyT time.Time
-	if str == emptyT.Format(format) {
+	if t.IsZero() {
 		return ""
 	}
 	return str