1

services/contract_return_service.go

@@ -36,8 +36,8 @@ func (s *contractService) makeContractRetrunVM(data *models.CmContractsReturn) *
 	viewContractsReturn.Time = data.Time.Format(conf.SysTimeform)
 
 	price, _ := strconv.ParseFloat(data.Price, 64)
-	viewContractsReturn.PriceFloat = price
-	viewContractsReturn.Price = utils.PriceToStringFormat(price)
+	viewContractsReturn.PriceString = utils.PriceToStringFormat(price)
+	viewContractsReturn.Price = price
 
 	viewContractsReturn.Way = data.Way
 	viewContractsReturn.CreateUser = data.CreateUser
@@ -138,7 +138,7 @@ func (s *contractService) ReturnCreate(returnData *viewmodels.ContractsReturn, p
 	}
 
 	// 1-3已支付的中金额不能超过 合同金额
-	price, err := decimal.NewFromString(returnData.Price)
+	price, err := decimal.NewFromString(returnData.PriceString)
 	if err != nil {
 		return errors.New("金额填写有误")
 	}
@@ -169,7 +169,7 @@ func (s *contractService) ReturnCreate(returnData *viewmodels.ContractsReturn, p
 	contractsReturnCm.CreateUser = returnData.CreateUser
 	contractsReturnCm.AccountId = projectAccountId
 
-	contractsReturnCm.Price = returnData.Price
+	contractsReturnCm.Price = returnData.PriceString
 
 	// 3.新增回款
 	err = s.contractReturnDao.Add(contractsReturnCm)
@@ -204,7 +204,7 @@ func (s *contractService) ReturnUpdate(returnData *viewmodels.ContractsReturn, p
 	}
 
 	// 1-3已支付的中金额不能超过 合同金额
-	price, err := decimal.NewFromString(returnData.Price)
+	price, err := decimal.NewFromString(returnData.PriceString)
 	if err != nil {
 		return errors.New("金额填写有误")
 	}
@@ -235,7 +235,7 @@ func (s *contractService) ReturnUpdate(returnData *viewmodels.ContractsReturn, p
 	}
 	contractsReturnCm.Time = time
 
-	contractsReturnCm.Price = returnData.Price
+	contractsReturnCm.Price = returnData.PriceString
 
 	columns := []string{"Way", "Remarks", "Time", "Price"}
 

web/viewmodels/contracts_return.go

@@ -14,15 +14,15 @@ type ContractsReturn struct {
 	ProjectId    string `form:"projectId" json:"projectId" `
 	BidsectionId string `form:"bidsectionId" json:"bidsectionId" `
 	// TreeId       string `form:"treeId" json:"treeId" `
-	Time       string  `form:"time" json:"time" `
-	PriceFloat float64 `form:"priceFloat" json:"priceFloat" `
-	Price      string  `form:"price" json:"price" `
-	Way        string  `form:"way" json:"way" `
-	CreateUser string  `form:"createUser" json:"createUser" `
-	AccountId  string  `form:"accountId" json:"accountId" `
-	Remarks    string  `form:"remarks" json:"remarks" `
-	CreateTime string  `form:"createTime" json:"createTime" `
-	FileCounts int64   `from:"fileCounts" json:"fileCounts"`
+	Time        string  `form:"time" json:"time" `
+	PriceString string  `form:"priceString" json:"priceString" `
+	Price       float64 `form:"price" json:"price" `
+	Way         string  `form:"way" json:"way" `
+	CreateUser  string  `form:"createUser" json:"createUser" `
+	AccountId   string  `form:"accountId" json:"accountId" `
+	Remarks     string  `form:"remarks" json:"remarks" `
+	CreateTime  string  `form:"createTime" json:"createTime" `
+	FileCounts  int64   `from:"fileCounts" json:"fileCounts"`
 
 	Page int `form:"page" json:"page" `
 }