fix

controller/contract/pre_payment.go

@@ -1,7 +1,6 @@
 package contract
 
 import (
-	"encoding/json"
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"github.com/go-playground/validator/v10"
@@ -10,7 +9,6 @@ import (
 	"hongze/fms_api/models/base"
 	"hongze/fms_api/models/fms"
 	"hongze/fms_api/models/system"
-	"hongze/fms_api/services/alarm_msg"
 	fmsService "hongze/fms_api/services/fms"
 	"hongze/fms_api/utils"
 	"time"
@@ -252,7 +250,7 @@ func (rg *PrePaymentController) Edit(c *gin.Context) {
 // @Success 200 string "操作成功"
 // @router /contract/pre_pay/del [post]
 func (rg *PrePaymentController) Del(c *gin.Context) {
-	req := new(fms.ContractRegisterDelReq)
+	req := new(fms.PrepayDelReq)
 	err := c.ShouldBind(&req)
 	if err != nil {
 		errs, ok := err.(validator.ValidationErrors)
@@ -263,11 +261,9 @@ func (rg *PrePaymentController) Del(c *gin.Context) {
 		resp.FailData("参数解析失败", errs.Translate(global.Trans), c)
 		return
 	}
-	claims, _ := c.Get("adminInfo")
-	adminInfo := claims.(*system.SysAdmin)
 
-	ob := new(fms.ContractRegister)
-	item, e := ob.Fetch(req.ContractRegisterId)
+	ob := new(fms.ContractPrePayment)
+	item, e := ob.Fetch(req.PrePayId)
 	if e != nil {
 		if e == utils.ErrNoRow {
 			resp.Fail("合同登记不存在或已被删除", c)
@@ -276,47 +272,32 @@ func (rg *PrePaymentController) Del(c *gin.Context) {
 		resp.FailMsg("获取合同登记失败", "Err:"+e.Error(), c)
 		return
 	}
-	nowTime := time.Now().Local()
-	item.IsDeleted = 1
-	item.ModifyTime = nowTime
-	updateCols := []string{"IsDeleted", "ModifyTime"}
-	if e = item.Update(updateCols); e != nil {
-		resp.FailMsg("操作失败", "更新合同登记失败, Err:"+e.Error(), c)
+	e = item.Delete()
+	if e != nil {
+		resp.FailMsg("删除记录失败", "Err:"+e.Error(), c)
 		return
 	}
 
-	// 删除对应的开票到款登记
-	go func() {
-		if e = fms.DeleteContractInvoicesByRegisterId(item.ContractRegisterId); e != nil {
-			alarm_msg.SendAlarmMsg(fmt.Sprintf("删除合同登记%d后, 删除开票到款记录失败, ErrMsg: %s", item.ContractRegisterId, e.Error()), 3)
-			return
-		}
-		if e = fms.DeleteInvoicePaymentSummaryByRegisterId(item.ContractRegisterId); e != nil {
-			alarm_msg.SendAlarmMsg(fmt.Sprintf("删除合同登记%d后, 删除开票到款汇总数据失败, ErrMsg: %s", item.ContractRegisterId, e.Error()), 3)
-			return
-		}
-	}()
-
 	// 操作日志
-	go func() {
-		opData := ""
-		opDataByte, e := json.Marshal(req)
-		if e != nil {
-			return
-		}
-		opData = string(opDataByte)
-
-		logItem := new(fms.ContractRegisterLog)
-		logItem.ContractRegisterId = req.ContractRegisterId
-		logItem.AdminId = int(adminInfo.AdminId)
-		logItem.AdminName = adminInfo.RealName
-		logItem.OpData = opData
-		logItem.OpType = fms.ContractRegisterOpTypeDel
-		logItem.CreateTime = nowTime
-		if e = logItem.Create(); e != nil {
-			return
-		}
-	}()
+	//go func() {
+	//	opData := ""
+	//	opDataByte, e := json.Marshal(req)
+	//	if e != nil {
+	//		return
+	//	}
+	//	opData = string(opDataByte)
+	//
+	//	logItem := new(fms.ContractRegisterLog)
+	//	logItem.ContractRegisterId = req.ContractRegisterId
+	//	logItem.AdminId = int(adminInfo.AdminId)
+	//	logItem.AdminName = adminInfo.RealName
+	//	logItem.OpData = opData
+	//	logItem.OpType = fms.ContractRegisterOpTypeDel
+	//	logItem.CreateTime = nowTime
+	//	if e = logItem.Create(); e != nil {
+	//		return
+	//	}
+	//}()
 
 	resp.Ok("操作成功", c)
 }

models/fms/contract_pre_payment.go

@@ -130,9 +130,18 @@ func (c *ContractPrePayment) Update(updateCols []string) (err error) {
 	return
 }
 
+// 删除
+func (c *ContractPrePayment) Delete() (err error) {
+	err = global.DEFAULT_MYSQL.Delete(c).Error
+	return
+}
 
-// ContractRegisterEditReq 编辑合同登记请求体
+// PrepayEditReq 编辑到款预登记请求体
 type PrepayEditReq struct {
-	PrePayId int `json:"pre_pay_id" binding:"required,gte=1" description:"登记ID"`
+	PrePayId int `json:"pre_pay_id" binding:"required,gte=1" description:"预付款ID"`
 	PrepayAddReq
-}
+}
+// PrepayDelReq 删除到款预登记
+type PrepayDelReq struct {
+	PrePayId int `json:"pre_pay_id" binding:"required,gte=1" description:"预付款ID"`
+}