From d7c325685068d0d525448130028da83c3c961985 Mon Sep 17 00:00:00 2001 From: jiangyong27 Date: Thu, 27 Mar 2025 19:29:57 +0800 Subject: [PATCH] pay3 --- server/api/staff.go | 2 +- server/server.go | 1 + server/service/staff_user.go | 7 +------ 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/server/api/staff.go b/server/api/staff.go index 3df29af..8f62529 100644 --- a/server/api/staff.go +++ b/server/api/staff.go @@ -56,7 +56,7 @@ type StaffPayReq struct { StaffId string `json:"staff_id"` PayType string `json:"pay_type"` Title string `json:"title"` - Amount string `json:"amount"` + Amount int64 `json:"amount"` } type StaffUpdateReq struct { diff --git a/server/server.go b/server/server.go index ff297ba..9eba2ec 100644 --- a/server/server.go +++ b/server/server.go @@ -35,6 +35,7 @@ func initRoutge(engine *gin.Engine) { apiGroup.GET("/staff/salary", controller.NewSalary().List) apiGroup.POST("/staff/salary", controller.NewSalary().Create) apiGroup.POST("/staff/salary/pay", controller.NewSalary().Pay) + apiGroup.POST("/salary/pay", controller.NewSalary().Pay) apiGroup.PUT("/staff/salary", controller.NewSalary().Update) apiGroup.DELETE("/staff/salary", controller.NewSalary().Delete) diff --git a/server/service/staff_user.go b/server/service/staff_user.go index 10d2995..4071d82 100644 --- a/server/service/staff_user.go +++ b/server/service/staff_user.go @@ -194,15 +194,10 @@ func (s *StaffUser) Pay(sess *session.AdminSession, req *api.StaffPayReq) { session.CheckDBError(err) session.CheckNilError(corp, "企业不存在") - var payReq api.PayReq - payReq.Title = req.Title - payReq.Amount = cast.ToInt64(req.Amount) - user, err := dao.NewStaffUserDao().Get(cast.ToInt64(req.StaffId)) session.CheckDBError(err) session.CheckNilError(user, "用户不存在") - log.Errorf("pay user[%s] amount[%s]", user.Username, goutil.FormatMoney(cast.ToInt64(req.Amount))) - return + NewPay().Pay(corp, user, req.Title, req.PayType, cast.ToInt64(req.Amount)) }