first

controller/census/invoice_payment.go

@@ -816,7 +816,7 @@ func (ct *InvoicePaymentController) List(c *gin.Context) {
 		}()
 
 		// 开票到款金额合计(换算后)
-		var invoiceTotal, paymentTotal float64
+		var invoiceTotal, paymentTotal,amountTotal float64
 		wg.Add(1)
 		go func() {
 			defer wg.Done()
@@ -839,6 +839,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(amountTotalPars, 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 +937,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
 	}

controller/contract/pre_register.go

@@ -572,8 +572,15 @@ 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")
 		} else {
 			//到款
 			pp.ArriveRemark = r.Remark
@@ -582,7 +589,22 @@ 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")
 		}
 
 		if pp.PreRegisterId == 0 {

controller/contract/register.go

@@ -1155,10 +1155,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 +1168,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)

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:"到款-分币种总金额"`
 }

models/fms/contract_pre_register.go

@@ -9,33 +9,39 @@ 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:"约定结束时间"`
+	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 +51,37 @@ 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:"创建时间"`
+	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 +110,12 @@ 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
 	return
 }
 

models/fms/invoice_payment_summary.go

@@ -161,4 +161,16 @@ func DeleteInvoicePaymentSummaryByInvoiceIdAndPaymentId(invoiceId, arriveId, reg
 	sql := `DELETE FROM invoice_payment_summary WHERE invoice_id = ? AND payment_id = ? AND register_id = ?`
 	err = global.DEFAULT_MYSQL.Exec(sql, invoiceId, arriveId, registerId).Error
 	return
+}
+
+// GetContractSummaryInvoicePaymentAmount 获取汇总金额合计信息
+func GetContractSummaryInvoicePaymentAmount(condition string, pars []interface{}) (amountTotal float64, err error) {
+	joinCond := `a.contract_register_id = b.contract_register_id `
+
+	query := global.DEFAULT_MYSQL.Table("invoice_payment_summary AS a").
+		Select("IFNULL(SUM(b.amount),0)").
+		Joins(fmt.Sprintf("JOIN contract_invoice AS b ON %s AND b.is_deleted = 0 ", joinCond)).
+		Where(condition, pars...)
+	err = query.Find(&amountTotal).Error
+	return
 }