|
@@ -198,6 +198,20 @@ func (s *contractService) ReturnUpdate(returnData *viewmodels.ContractsReturn, p
|
|
|
return errors.New("合同已关闭")
|
|
|
}
|
|
|
|
|
|
+ // 1-3已支付的中金额不能超过 合同金额
|
|
|
+ price, err := strconv.ParseFloat(returnData.Price, 64)
|
|
|
+ if err != nil {
|
|
|
+ return errors.New("金额填写有误")
|
|
|
+ }
|
|
|
+ contractPrice, _ := strconv.ParseFloat(contract.Price, 64)
|
|
|
+ returnedPrice, _ := strconv.ParseFloat(contract.Returned, 64)
|
|
|
+ // 合同金额-(回款总金额-当前回款金额)
|
|
|
+ resultPrice := contractPrice - (returnedPrice - price)
|
|
|
+
|
|
|
+ if price > resultPrice {
|
|
|
+ return errors.New("回款金额不能超过合同金额")
|
|
|
+ }
|
|
|
+
|
|
|
// 2.回款信息
|
|
|
contractsReturnCm := &models.CmContractsReturn{}
|
|
|
contractsReturnCm.Id = id
|
|
@@ -211,10 +225,6 @@ func (s *contractService) ReturnUpdate(returnData *viewmodels.ContractsReturn, p
|
|
|
}
|
|
|
contractsReturnCm.Time = time
|
|
|
|
|
|
- _, err = strconv.ParseFloat(returnData.Price, 64)
|
|
|
- if err != nil {
|
|
|
- return errors.New("金额填写有误")
|
|
|
- }
|
|
|
contractsReturnCm.Price = returnData.Price
|
|
|
|
|
|
columns := []string{"Way", "Remarks", "Time", "Price"}
|