caipin 4 lat temu
rodzic
commit
42a265d63c

+ 2 - 3
services/contract_expenditure_service.go

@@ -10,7 +10,6 @@ package services
 import (
 	"errors"
 	"fmt"
-	"strconv"
 	"time"
 
 	"github.com/shopspring/decimal"
@@ -44,7 +43,7 @@ func (s *contractService) AddExpenditure(contractData *viewmodels.Contracts, pro
 	contractsCm.Name = contractData.Name
 	contractsCm.ContractsType = 2
 
-	contractsCm.Price = strconv.FormatFloat(contractData.Price, 'f', 2, 64)
+	contractsCm.Price = fmt.Sprintf("%.2f", contractData.Price)
 	// contractsCm.Price = contractData.Price
 	contractsCm.Returned = "0"
 	contractsCm.Paid = "0"
@@ -103,7 +102,7 @@ func (s *contractService) UpdateExpenditure(contractData *viewmodels.Contracts,
 	contractsCm.Id = contractsTree.ContractId
 	contractsCm.Content = contractData.Content
 	contractsCm.Name = contractData.Name
-	contractsCm.Price = strconv.FormatFloat(contractData.Price, 'f', 2, 64)
+	contractsCm.Price = fmt.Sprintf("%.2f", contractData.Price)
 	contractsCm.PartyA = contractData.PartyA
 	contractsCm.PartyASigner = contractData.PartyASigner
 	contractsCm.PartyB = contractData.PartyB

+ 5 - 2
services/contract_return_service.go

@@ -9,6 +9,7 @@ package services
 
 import (
 	"errors"
+	"fmt"
 	"log"
 	"strconv"
 	"time"
@@ -170,7 +171,7 @@ func (s *contractService) ReturnCreate(returnData *viewmodels.ContractsReturn, p
 	contractsReturnCm.CreateUser = returnData.CreateUser
 	contractsReturnCm.AccountId = projectAccountId
 
-	contractsReturnCm.Price = strconv.FormatFloat(returnData.Price, 'f', 2, 64)
+	contractsReturnCm.Price = fmt.Sprintf("%.2f", returnData.Price)
 
 	// 3.新增回款
 	err = s.contractReturnDao.Add(contractsReturnCm)
@@ -239,7 +240,9 @@ func (s *contractService) ReturnUpdate(returnData *viewmodels.ContractsReturn, p
 	contractsReturnCm.Time = time
 
 	// contractsReturnCm.Price = returnData.PriceString
-	contractsReturnCm.Price = strconv.FormatFloat(returnData.Price, 'f', 2, 64)
+	// strconv.FormatFloat(returnData.Price)
+
+	contractsReturnCm.Price = fmt.Sprintf("%.2f", returnData.Price)
 
 	columns := []string{"Way", "Remarks", "Time", "Price"}
 

+ 3 - 2
services/contract_service.go

@@ -376,7 +376,7 @@ func (s *contractService) Add(contractData *viewmodels.Contracts, projectId int,
 	contractsCm.Name = contractData.Name
 	contractsCm.ContractsType = 1
 
-	contractsCm.Price = strconv.FormatFloat(contractData.Price, 'f', 1, 64)
+	contractsCm.Price = fmt.Sprintf("%.2f", contractData.Price)
 	// contractsCm.Price = contractData.Price
 	contractsCm.Returned = "0"
 	contractsCm.Paid = "0"
@@ -436,7 +436,8 @@ func (s *contractService) Update(contractData *viewmodels.Contracts, projectId i
 	contractsCm.Content = contractData.Content
 	contractsCm.Name = contractData.Name
 
-	contractsCm.Price = strconv.FormatFloat(contractData.Price, 'f', 1, 64)
+	contractsCm.Price = fmt.Sprintf("%.2f", contractData.Price)
+	//  strconv.FormatFloat(contractData.Price, 'f', 1, 64)
 	// contractsCm.Price = contractData.Price
 	contractsCm.PartyA = contractData.PartyA
 	contractsCm.PartyASigner = contractData.PartyASigner