Merge branch 'fms_3.0' into debug

controller/census/invoice_payment.go

@@ -27,258 +27,6 @@ import (
 // InvoicePaymentController 商品到款统计
 type InvoicePaymentController struct{}
 
-// List2 原版(已废弃)
-//func (ct *InvoicePaymentController) List2(c *gin.Context) {
-//	var req fms.InvoicePaymentCensusListReq
-//	if e := c.BindQuery(&req); e != nil {
-//		err, ok := e.(validator.ValidationErrors)
-//		if !ok {
-//			resp.FailData("参数解析失败", "Err:"+e.Error(), c)
-//			return
-//		}
-//		resp.FailData("参数解析失败", err.Translate(global.Trans), c)
-//		return
-//	}
-//
-//	cond := `1 = 1`
-//	pars := make([]interface{}, 0)
-//	// 合同编号/客户姓名/销售
-//	if req.Keyword != "" {
-//		kw := "%" + req.Keyword + "%"
-//		cond += ` AND b.company_name LIKE ? OR a.seller_name LIKE ?`
-//		pars = append(pars, kw, kw)
-//	}
-//	if req.SellGroupId > 0 {
-//		cond += ` AND a.seller_group_id = ?`
-//		pars = append(pars, req.SellGroupId)
-//	}
-//	// 套餐筛选
-//	if req.ServiceType != 0 {
-//		registerIds, e := fms.GetContractRegisterIdsByTempId(req.ServiceType)
-//		if e != nil {
-//			resp.FailMsg("获取失败", "获取合同登记IDs失败, Err: "+e.Error(), c)
-//			return
-//		}
-//		if len(registerIds) > 0 {
-//			cond += ` AND b.contract_register_id IN ?`
-//			pars = append(pars, registerIds)
-//		} else {
-//			cond += ` AND 1 = 2`
-//		}
-//	}
-//	// 开票到款日期
-//	if req.TimeType > 0 && req.StartDate != "" && req.EndDate != "" {
-//		st := fmt.Sprint(req.StartDate, " 00:00:00")
-//		ed := fmt.Sprint(req.EndDate, " 23:59:59")
-//		cond += ` AND a.invoice_type = ? AND (a.invoice_time BETWEEN ? AND ?)`
-//		pars = append(pars, req.TimeType, st, ed)
-//	}
-//	// 已开票
-//	if req.HasInvoice == 1 && req.HasPayment == 0 {
-//		cond += ` AND a.invoice_type = 1`
-//	}
-//	// 已到款
-//	if req.HasInvoice == 0 && req.HasPayment == 1 {
-//		cond += ` AND a.invoice_type = 2`
-//	}
-//
-//	page := new(base.Page)
-//	page.SetPageSize(req.PageSize)
-//	page.SetCurrent(req.Current)
-//	page.AddOrderItem(base.OrderItem{Column: "a.create_time", Asc: false})
-//	page.AddOrderItem(base.OrderItem{Column: "b.contract_register_id", Asc: true})
-//	if req.IsExport == 1 {
-//		page.SetPageSize(10000)
-//		page.SetCurrent(1)
-//	}
-//
-//	list, allRegisterIds, e := fms.GetInvoicePaymentCensusPageList(page, cond, pars)
-//	if e != nil {
-//		resp.FailMsg("获取失败", "获取商品到款统计列表失败, Err: "+e.Error(), c)
-//		return
-//	}
-//	total := int64(len(allRegisterIds))
-//	registerIds := make([]int, 0)
-//	for i := range list {
-//		registerIds = append(registerIds, list[i].ContractRegisterId)
-//	}
-//
-//	results := new(fms.InvoicePaymentCensusResp)
-//	if len(registerIds) > 0 {
-//		// 获取开票到款列表
-//		ivCond := `contract_register_id IN ?`
-//		ivPars := make([]interface{}, 0)
-//		ivPars = append(ivPars, registerIds)
-//		iv := new(fms.ContractInvoice)
-//		invoiceList, e := iv.List(ivCond, ivPars, "")
-//		if e != nil {
-//			resp.FailMsg("获取失败", "获取开票到款列表失败, Err: "+e.Error(), c)
-//			return
-//		}
-//		// 取出开票、到款
-//		invoiceMap := make(map[int][]*fms.ContractInvoice, 0)
-//		paymentMap := make(map[int][]*fms.ContractInvoice, 0)
-//		paymentIds := make([]int, 0)
-//		for i := range invoiceList {
-//			if invoiceMap[invoiceList[i].ContractRegisterId] == nil {
-//				invoiceMap[invoiceList[i].ContractRegisterId] = make([]*fms.ContractInvoice, 0)
-//			}
-//			if paymentMap[invoiceList[i].ContractRegisterId] == nil {
-//				paymentMap[invoiceList[i].ContractRegisterId] = make([]*fms.ContractInvoice, 0)
-//			}
-//			if invoiceList[i].InvoiceType == fms.ContractInvoiceTypeMake {
-//				invoiceMap[invoiceList[i].ContractRegisterId] = append(invoiceMap[invoiceList[i].ContractRegisterId], invoiceList[i])
-//			}
-//			if invoiceList[i].InvoiceType == fms.ContractInvoiceTypePay {
-//				paymentMap[invoiceList[i].ContractRegisterId] = append(paymentMap[invoiceList[i].ContractRegisterId], invoiceList[i])
-//				paymentIds = append(paymentIds, invoiceList[i].ContractInvoiceId)
-//			}
-//		}
-//
-//		// 合同套餐
-//		contractServiceCond := `contract_register_id IN ?`
-//		contractServicePars := make([]interface{}, 0)
-//		contractServicePars = append(contractServicePars, registerIds)
-//		contractServiceOB := new(fms.ContractService)
-//		contractServiceList, e := contractServiceOB.List(contractServiceCond, contractServicePars)
-//		if e != nil {
-//			resp.FailMsg("获取失败", "获取合同套餐列表失败, Err:"+e.Error(), c)
-//			return
-//		}
-//		contractServiceMap := make(map[int][]*fms.ContractService, 0)
-//		servicesNameMap := make(map[int][]string, 0)
-//		for i := range contractServiceList {
-//			if contractServiceMap[contractServiceList[i].ContractRegisterId] == nil {
-//				contractServiceMap[contractServiceList[i].ContractRegisterId] = make([]*fms.ContractService, 0)
-//			}
-//			contractServiceMap[contractServiceList[i].ContractRegisterId] = append(contractServiceMap[contractServiceList[i].ContractRegisterId], contractServiceList[i])
-//			servicesNameMap[contractServiceList[i].ContractRegisterId] = append(servicesNameMap[contractServiceList[i].ContractRegisterId], contractServiceList[i].Title)
-//		}
-//
-//		// 到款套餐分配
-//		serviceAmountMap := make(map[int][]*fms.ContractPaymentServiceAmount, 0)
-//		if len(paymentIds) > 0 {
-//			serviceAmountCond := `contract_payment_id IN ?`
-//			serviceAmountPars := make([]interface{}, 0)
-//			serviceAmountPars = append(serviceAmountPars, paymentIds)
-//			serviceAmountOB := new(fms.ContractPaymentServiceAmount)
-//			serviceAmountList, e := serviceAmountOB.List(serviceAmountCond, serviceAmountPars)
-//			if e != nil {
-//				resp.FailMsg("获取失败", "获取到款套餐分配列表失败, Err:"+e.Error(), c)
-//				return
-//			}
-//			for i := range serviceAmountList {
-//				if serviceAmountMap[serviceAmountList[i].ContractRegisterId] == nil {
-//					serviceAmountMap[serviceAmountList[i].ContractRegisterId] = make([]*fms.ContractPaymentServiceAmount, 0)
-//				}
-//				serviceAmountMap[serviceAmountList[i].ContractRegisterId] = append(serviceAmountMap[serviceAmountList[i].ContractRegisterId], serviceAmountList[i])
-//			}
-//		}
-//
-//		// 整合响应数据
-//		respList := make([]*fms.InvoicePaymentCensusItem, 0)
-//		for i := range list {
-//			v := new(fms.InvoicePaymentCensusItem)
-//			v.ContractRegisterId = list[i].ContractRegisterId
-//			v.CompanyName = list[i].CompanyName
-//			v.NewCompany = list[i].NewCompany
-//			v.StartDate = list[i].StartDate.Format(utils.FormatDate)
-//			v.EndDate = list[i].EndDate.Format(utils.FormatDate)
-//			svList := servicesNameMap[list[i].ContractRegisterId]
-//			v.ServicesName = strings.Join(svList, ",")
-//			// 格式化(合并)开票到款数据
-//			v.InvoicePaymentList = fmsService.MergeInvoiceList2InvoicePaymentCensusInfo(invoiceMap[list[i].ContractRegisterId], paymentMap[list[i].ContractRegisterId],
-//				contractServiceMap[list[i].ContractRegisterId], serviceAmountMap[list[i].ContractRegisterId])
-//			respList = append(respList, v)
-//		}
-//
-//		// 开票到款金额合计(换算后)
-//		amountTotalCond := `contract_register_id IN ?`
-//		amountTotalPars := make([]interface{}, 0)
-//		amountTotalPars = append(amountTotalPars, allRegisterIds)
-//		amountTotalList, e := fms.GetContractInvoiceAmountTotal(amountTotalCond, amountTotalPars)
-//		if e != nil {
-//			resp.FailMsg("获取失败", "获取开票到款金额合计失败, Err:"+e.Error(), c)
-//			return
-//		}
-//		amountTotalMap := make(map[int]float64)
-//		for i := range amountTotalList {
-//			amountTotalMap[amountTotalList[i].InvoiceType] = amountTotalList[i].TotalAmount
-//		}
-//		invoiceTotal, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", amountTotalMap[fms.ContractInvoiceTypeMake]), 64)
-//		paymentTotal, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", amountTotalMap[fms.ContractInvoiceTypePay]), 64)
-//
-//		// 分币种金额统计
-//		currencyOB := new(fms.CurrencyUnit)
-//		currencyCond := `enable = 1`
-//		currencyPars := make([]interface{}, 0)
-//		currencyList, e := currencyOB.List(currencyCond, currencyPars)
-//		if e != nil {
-//			resp.FailMsg("获取失败", "获取货币列表失败, Err: "+e.Error(), c)
-//			return
-//		}
-//		unitMap := make(map[string]string)
-//		invoiceCurrencyTotals := make([]*fms.InvoiceListCurrencyTotal, 0)
-//		paymentCurrencyTotals := make([]*fms.InvoiceListCurrencyTotal, 0)
-//		for i := range currencyList {
-//			unitMap[currencyList[i].Code] = currencyList[i].UnitName
-//			invoiceCurrencyTotals = append(invoiceCurrencyTotals, &fms.InvoiceListCurrencyTotal{
-//				Name:     currencyList[i].Name,
-//				UnitName: currencyList[i].UnitName,
-//				Code:     currencyList[i].Code,
-//				FlagImg:  currencyList[i].FlagImg,
-//			})
-//			paymentCurrencyTotals = append(paymentCurrencyTotals, &fms.InvoiceListCurrencyTotal{
-//				Name:     currencyList[i].Name,
-//				UnitName: currencyList[i].UnitName,
-//				Code:     currencyList[i].Code,
-//				FlagImg:  currencyList[i].FlagImg,
-//			})
-//		}
-//		sumList, e := fms.GetInvoiceListCurrencySum(amountTotalCond, amountTotalPars, "currency_unit, invoice_type")
-//		if e != nil {
-//			resp.FailMsg("获取失败", "获取商品到款统计货币合计金额失败, Err: "+e.Error(), c)
-//			return
-//		}
-//		invoiceSumMap := make(map[string]float64)
-//		paymentSumMap := make(map[string]float64)
-//		for i := range sumList {
-//			if sumList[i].InvoiceType == fms.ContractInvoiceTypeMake {
-//				invoiceSumMap[sumList[i].CurrencyUnit] = sumList[i].OriginAmountTotal
-//				continue
-//			}
-//			if sumList[i].InvoiceType == fms.ContractInvoiceTypePay {
-//				paymentSumMap[sumList[i].CurrencyUnit] = sumList[i].OriginAmountTotal
-//			}
-//		}
-//		for i := range invoiceCurrencyTotals {
-//			a, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", invoiceSumMap[invoiceCurrencyTotals[i].Code]), 64)
-//			invoiceCurrencyTotals[i].Amount = a
-//		}
-//		for i := range paymentCurrencyTotals {
-//			a, _ := strconv.ParseFloat(fmt.Sprintf("%.2f", paymentSumMap[paymentCurrencyTotals[i].Code]), 64)
-//			paymentCurrencyTotals[i].Amount = a
-//		}
-//
-//		results.DataList = respList
-//		results.InvoiceTotal = invoiceTotal
-//		results.PaymentTotal = paymentTotal
-//		results.InvoiceCurrencyTotal = invoiceCurrencyTotals
-//		results.PaymentCurrencyTotal = paymentCurrencyTotals
-//	}
-//
-//	// 是否导出
-//	if req.IsExport == 1 {
-//		ExportInvoicePaymentCensusList(c, results)
-//		return
-//	}
-//	page.SetTotal(total)
-//	baseData := new(base.BaseData)
-//	baseData.SetPage(page)
-//	baseData.SetList(results)
-//	resp.OkData("获取成功", baseData, c)
-//}
-
 // ExportInvoicePaymentCensusList 导出商品到款统计列表
 func ExportInvoicePaymentCensusList(c *gin.Context, results *fms.InvoicePaymentCensusResp) {
 	list := results.DataList

controller/contract/pre_register.go

@@ -22,8 +22,8 @@ import (
 type PreRegisterController struct{}
 
 // InvoiceList
-// @Title 开票/到款列表
-// @Description 开票/到款列表
+// @Title 预登记列表
+// @Description 预登记列表
 // @Param   Keyword			query	string	false	"关键词"
 // @Success 200 {object} fms.ContractInvoiceItem
 // @router /contract/pre_register/list [get]

models/fms/invoice_payment_summary.go

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