caipin %!s(int64=4) %!d(string=hai) anos
pai
achega
13c1dfeb4c
Modificáronse 2 ficheiros con 7 adicións e 2 borrados
  1. 3 1
      services/contract_paid_service.go
  2. 4 1
      services/contract_return_service.go

+ 3 - 1
services/contract_paid_service.go

@@ -52,7 +52,9 @@ func (s *contractService) PaidCreate(returnData *viewmodels.ContractsPaid, proje
 		return errors.New("金额填写有误")
 	}
 	paidPrice, _ := strconv.ParseFloat(contract.Paid, 64)
-	if price > paidPrice {
+	contractPrice, _ := strconv.ParseFloat(contract.Price, 64)
+	resultPrice := contractPrice - paidPrice
+	if price > resultPrice {
 		return errors.New("支付金额不能超过合同金额")
 	}
 

+ 4 - 1
services/contract_return_service.go

@@ -138,7 +138,10 @@ func (s *contractService) ReturnCreate(returnData *viewmodels.ContractsReturn, p
 		return errors.New("金额填写有误")
 	}
 	returnedPrice, _ := strconv.ParseFloat(contract.Returned, 64)
-	if price > returnedPrice {
+	contractPrice, _ := strconv.ParseFloat(contract.Price, 64)
+	resultPrice := contractPrice - returnedPrice
+
+	if price > resultPrice {
 		return errors.New("回款金额不能超过合同金额")
 	}