Merge branch 'pool_333'

controller/contract/register.go

@@ -463,7 +463,7 @@ func (rg *RegisterController) Add(c *gin.Context) {
 			}
 		}
 		for _, ppItem := range invoiceList {
-			j,k := 0,0
+			j, k := 0, 0
 			v := &fms.ContractInvoice{
 				ContractRegisterId: ob.ContractRegisterId,
 				ContractCode:       ob.ContractCode,
@@ -759,7 +759,7 @@ func (rg *RegisterController) Add(c *gin.Context) {
 					v.InvoiceType = 1
 				} else if ppItem.InvoiceType == 4 {
 					v.InvoiceType = 2
-					if sellerItem, ok := sellerItemMap[j]; ok{
+					if sellerItem, ok := sellerItemMap[j]; ok {
 						v.SellerId = sellerItem.SellerId
 						v.SellerName = sellerItem.SellerName
 						v.SellerGroupId = sellerItem.GroupId
@@ -1441,6 +1441,65 @@ func (rg *RegisterController) Invoice(c *gin.Context) {
 				return
 			}
 			if req.AmountList[i].InvoiceId > 0 {
+				v := &fms.ContractInvoice{
+					ContractInvoiceId: req.AmountList[i].InvoiceId,
+					Amount:            req.AmountList[i].Amount,
+					OriginAmount:      req.AmountList[i].OriginAmount,
+					CurrencyUnit:      item.CurrencyUnit,
+					ServiceProductId:  req.AmountList[i].ServiceProductId,
+					InvoiceDate:       t,
+					AdminId:           int(adminInfo.AdminId),
+					AdminName:         adminInfo.RealName,
+					Remark:            req.AmountList[i].Remark,
+				}
+				v.Set()
+				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)
+
+				if e = v.Update([]string{"Amount", "OriginAmount", "CurrencyUnit", "ServiceProductId", "InvoiceDate",
+					"AdminId", "AdminName", "Remark", "SellerId", "SellerName", "SellerGroupId", "SellerGroupName", "SellerTeamId", "SellerTeamName"}); e != nil {
+					resp.FailMsg("操作失败", "更新到款登记失败, Err:"+e.Error(), c)
+					return
+				}
+				if req.InvoiceType == fms.ContractInvoiceTypeMake {
+					//修改对应到款的销售
+					summaryItem, err := fms.GetInvoicePaymentSummaryByRegisterIdAndInvoiceId(req.ContractRegisterId, req.AmountList[i].InvoiceId)
+					if err != nil {
+						resp.FailMsg("获取汇总数据失败", "修改到款销售时获取汇总数据失败, Err: "+err.Error(), c)
+						return
+					}
+
+					if summaryItem.PaymentId > 0 {
+						paymentItem := fms.ContractInvoice{}
+						paymentItem.ContractInvoiceId = summaryItem.PaymentId
+						paymentItem.SellerId = sellerItem.SellerId
+						paymentItem.SellerName = sellerItem.SellerName
+						paymentItem.SellerGroupId = sellerItem.GroupId
+						paymentItem.SellerGroupName = sellerItem.GroupName
+						paymentItem.SellerTeamId = sellerItem.TeamId
+						paymentItem.SellerTeamName = sellerItem.TeamName
+						e = paymentItem.Update([]string{"SellerId", "SellerName", "SellerGroupId", "SellerGroupName", "SellerTeamId", "SellerTeamName"})
+						if e != nil {
+							resp.FailMsg("更新到款销售失败", "更新到款销售失败, Err: "+e.Error(), c)
+							return
+						}
+					}
+				}
+
 				noChangeInvoiceIds = append(noChangeInvoiceIds, req.AmountList[i].InvoiceId)
 				continue
 			}
@@ -1566,33 +1625,6 @@ 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)
@@ -1606,7 +1638,38 @@ func (rg *RegisterController) Invoice(c *gin.Context) {
 	go fmsService.CheckContractRegisterAmount(req.ContractRegisterId)
 
 	// 开票到款汇总
-	go fmsService.SummaryInvoicePaymentByContractRegisterId(req.ContractRegisterId)
+	fmsService.SummaryInvoicePaymentByContractRegisterId(req.ContractRegisterId)
+
+	//如果是开票，强制修改到款记录的销售
+	if len(newInvoice) > 0 && req.InvoiceType == fms.ContractInvoiceTypeMake {
+		for _, invoice := range newInvoice {
+			summaryItem, err := fms.GetInvoicePaymentSummaryByRegisterIdAndInvoiceId(req.ContractRegisterId, invoice.ContractInvoiceId)
+			if err != nil {
+				resp.FailMsg("获取汇总数据失败", "修改到款销售时获取汇总数据失败, Err: "+err.Error(), c)
+				return
+			}
+			sellerItem := sellerMap[invoice.SellerId]
+			if sellerItem == nil {
+				resp.Fail("销售信息异常", c)
+				return
+			}
+			if summaryItem.PaymentId > 0 {
+				paymentItem := fms.ContractInvoice{}
+				paymentItem.ContractInvoiceId = summaryItem.PaymentId
+				paymentItem.SellerId = sellerItem.SellerId
+				paymentItem.SellerName = sellerItem.SellerName
+				paymentItem.SellerGroupId = sellerItem.GroupId
+				paymentItem.SellerGroupName = sellerItem.GroupName
+				paymentItem.SellerTeamId = sellerItem.TeamId
+				paymentItem.SellerTeamName = sellerItem.TeamName
+				e = paymentItem.Update([]string{"SellerId", "SellerName", "SellerGroupId", "SellerGroupName", "SellerTeamId", "SellerTeamName"})
+				if e != nil {
+					resp.FailMsg("更新到款销售失败", "更新到款销售失败, Err: "+e.Error(), c)
+					return
+				}
+			}
+		}
+	}
 
 	// 操作日志
 	go func() {
@@ -3580,7 +3643,7 @@ func (rg *RegisterController) Import(c *gin.Context) {
 							v.InvoiceType = 1
 						} else if ppItem.InvoiceType == 4 {
 							v.InvoiceType = 2
-							if sellerItem, ok := sellerItemMap[j]; ok{
+							if sellerItem, ok := sellerItemMap[j]; ok {
 								v.SellerId = sellerItem.SellerId
 								v.SellerName = sellerItem.SellerName
 								v.SellerGroupId = sellerItem.GroupId
@@ -3655,7 +3718,6 @@ func (rg *RegisterController) Import(c *gin.Context) {
 				go fmsService.CalculatePaymentServiceAmount(newId)
 				newIds = append(newIds, newId)
 
-
 			}
 		}
 	}

models/fms/contract_income_history.go

@@ -27,7 +27,7 @@ func (c *ContractIncomeHistory) TableName() string {
 	return "contract_income_history"
 }
 
-// GetInvoicePaymentSummaryByRegisterIdAndInvoiceId 根据合同登记ID和开票ID获取汇总数据
+// GetIncomeHistory
 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
@@ -36,7 +36,7 @@ func GetIncomeHistory(condition string, pars []interface{}) (results []*IncomeSu
 	return
 }
 
-// GetInvoicePaymentSummaryByRegisterIdAndInvoiceId 根据合同登记ID和开票ID获取汇总数据
+// GetIncomeHistoryList
 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

models/fms/invoice_payment_summary.go

@@ -185,9 +185,9 @@ func GetContractSummaryInvoicePaymentAmount(condition string, pars []interface{}
 }
 
 // GetInvoicePaymentSummaryByRegisterIdAndInvoiceId 根据合同登记ID和开票ID获取汇总数据
-func GetInvoicePaymentSummaryByRegisterIdAndInvoiceId(registerId, invocieId int) (results []*ContractRegisterSummary, err error) {
+func GetInvoicePaymentSummaryByRegisterIdAndInvoiceId(registerId, invocieId int) (result *InvoicePaymentSummary, 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
+	err = global.DEFAULT_MYSQL.Raw(sql, registerId, invocieId).First(&result).Error
 	return
 }