ziwen 2 年之前
父节点
当前提交
bdff7f2591
共有 2 个文件被更改,包括 4 次插入4 次删除
  1. 3 3
      controller/contract/register.go
  2. 1 1
      models/fms/contract_register.go

+ 3 - 3
controller/contract/register.go

@@ -361,8 +361,8 @@ func (rg *RegisterController) Add(c *gin.Context) {
 			return
 		}
 
-		prePayOB := new(fms.ContractPrePayment)
-		ppItem, e := prePayOB.Fetch(req.PrePayId)
+		prePayOB := new(fms.ContractInvoice)
+		ppItem, e := prePayOB.Fetch(req.ContractInvoiceId)
 		if e != nil {
 			if e == utils.ErrNoRow {
 				resp.Fail("预到款不存在或已被删除", c)
@@ -392,7 +392,7 @@ func (rg *RegisterController) Add(c *gin.Context) {
 			OriginAmount:       ppItem.OriginAmount,
 			CurrencyUnit:       ppItem.CurrencyUnit,
 			InvoiceType:        fms.ContractInvoiceTypePay,
-			InvoiceDate:        ppItem.PaymentDate,
+			InvoiceDate:        ppItem.InvoiceDate,
 			AdminId:            int(adminInfo.AdminId),
 			AdminName:          adminInfo.RealName,
 			Remark:             ppItem.Remark,

+ 1 - 1
models/fms/contract_register.go

@@ -187,7 +187,7 @@ type ContractRegisterAddReq struct {
 	HasPayment             int                           `json:"has_payment" description:"是否有代付: 0-无; 1-有"`
 	NewCompany             int                           `json:"new_company" description:"是否为新客户: 0-否; 1-是"`
 	Supplement             int                           `json:"supplement" description:"是否为补录合同: 0-否; 1-是"`
-	PrePayId               int                           `json:"pre_pay_id" description:"预到款信息ID"`
+	ContractInvoiceId               int                           `json:"contract_invoice_id" description:"预到款信息ID"`
 	Services               []ContractServiceAddReq       `json:"services" description:"服务套餐内容"`
 	ServiceAmount          []ContractServiceAmountAddReq `json:"service_amount" description:"服务套餐金额"`
 }