|
@@ -58,10 +58,10 @@ func (s *contractService) PaidCreate(returnData *viewmodels.ContractsPaid, proje
|
|
|
contractDeductionPrice := decimal.NewFromFloat(returnData.ContractDeduction)
|
|
|
contractPrice, _ := decimal.NewFromString(contract.Price)
|
|
|
paidPrice, _ := decimal.NewFromString(contract.Paid)
|
|
|
- paidContractDeductionTotal, _ := decimal.NewFromString(contract.ContractDeductionTotal)
|
|
|
+ // paidContractDeductionTotal, _ := decimal.NewFromString(contract.ContractDeductionTotal)
|
|
|
resultPrice := contractPrice.Sub(paidPrice)
|
|
|
resultPrice = resultPrice.Sub(contractDeductionPrice)
|
|
|
- resultPrice = resultPrice.Sub(paidContractDeductionTotal)
|
|
|
+ // resultPrice = resultPrice.Sub(paidContractDeductionTotal)
|
|
|
|
|
|
// 合同额-已支付金额+已扣款金额
|
|
|
if price.GreaterThan(resultPrice) {
|