1

services/contract_paid_service.go

@@ -130,7 +130,7 @@ func (s *contractService) PaidUpdate(returnData *viewmodels.ContractsPaid, proje
 	// }
 	contractPrice, _ := decimal.NewFromString(contract.Price)
 	paidPrice, _ := decimal.NewFromString(contract.Paid)
-	paidContractDeductionTotal, _ := decimal.NewFromString(contract.ContractDeductionTotal)
+	// paidContractDeductionTotal, _ := decimal.NewFromString(contract.ContractDeductionTotal)
 	// 当前回款金额
 	returnedPresentPrice, _ := decimal.NewFromString(contractPaid.Price)
 	// 合同金额-(回款总金额-当前回款金额)
@@ -138,7 +138,7 @@ func (s *contractService) PaidUpdate(returnData *viewmodels.ContractsPaid, proje
 	subPrice := paidPrice.Sub(returnedPresentPrice)
 	// 合同金额-subPrice
 	resultPrice := contractPrice.Sub(subPrice)
-	resultPrice = resultPrice.Sub(paidContractDeductionTotal)
+	// resultPrice = resultPrice.Sub(paidContractDeductionTotal)
 
 	if price.GreaterThan(resultPrice) {
 		return errors.New("支付金额不能超过合同金额")
@@ -163,7 +163,7 @@ func (s *contractService) PaidUpdate(returnData *viewmodels.ContractsPaid, proje
 	// }
 
 	contractsReturnCm.Price = fmt.Sprintf("%.2f", returnData.Price)
-	contractsReturnCm.ContractDeduction = fmt.Sprintf("%.2f", returnData.ContractDeduction)
+	// contractsReturnCm.ContractDeduction = fmt.Sprintf("%.2f", returnData.ContractDeduction)
 
 	// 3.更新已支付信息
 	err = s.contractPaidDao.Update(contractsReturnCm, contractsId, bidsectionId)