fix

controller/contract/pre_register.go

@@ -329,12 +329,12 @@ func (rg *PreRegisterController) Add(c *gin.Context) {
 			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
+			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
@@ -542,7 +542,8 @@ func (rg *PreRegisterController) Edit(c *gin.Context) {
 			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
@@ -588,6 +589,7 @@ 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
@@ -643,7 +645,7 @@ 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, sellerItem, req.RegisterType); e != nil {

models/fms/contract_register.go

@@ -616,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
@@ -663,7 +665,7 @@ func UpdateContractPreRegister(item *ContractRegister, updateCols []string, serv
 	}
 	if registerType == 3{
 		tx.Model(&invoiceItem).Select([]string{"StartDate", "EndDate", "CurrencyUnit","SellerId",
-			"SellerName","SellerGroupId","SellerGroupName","SellerTeamId","SellerTeamName"}).Where("contract_register_id", item.ContractRegisterId).Updates(invoiceItem)
+			"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)
 	}