loser/Lee-WineList
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 fix bug

Browse Source
This commit is contained in:
loser 2023-04-27 18:02:38 +08:00
parent 1212e999cc
commit 27daf68736
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/app/wine.go
View File

@ -1,6 +1,7 @@
package app
import (
"Lee-WineList/api"
"Lee-WineList/core"
"Lee-WineList/model/entity"
"Lee-WineList/model/param"
@ -76,7 +77,12 @@ func (w *wineApi) Delete(ctx *gin.Context) {
return
}
if err := repository.Wine().Delete(p); err != nil {
var ue entity.User
if api.GetUser(ctx, &ue, false, true); ctx.IsAborted() {
return
}
if err := repository.Wine().Delete(&p, &ue); err != nil {
core.R(ctx).FailWithMessage(err.Error())
return
}

2
model/entity/material.go
View File

@ -5,7 +5,7 @@ import "Lee-WineList/common/types"
type Material struct {
types.BaseDbModel
Name string `gorm:"column:name;type:varchar(255);comment:材料名;NOT NULL" json:"name"`
ML string `gorm:"column:ml;type:int(11) unsigned;comment:毫升" json:"ml"`
ML string `gorm:"column:ml;type:varchar(20) unsigned;comment:毫升" json:"ml"`
OtherUnit string `gorm:"column:other_unit;type:varchar(255);comment:其他单位" json:"other_unit"`
WindId int `gorm:"column:wine_id;type:int(11) unsigned;comment:酒ID;NOT NULL" json:"wine_id"`
}

8
repository/wine.go
View File

@ -44,7 +44,11 @@ func (w *wine) Update(p entity.Wine) (err error) {
return
}
func (w *wine) Delete(p entity.Wine) (err error) {
err = client.MySQL.Delete(&p).Error
func (w *wine) Delete(p *entity.Wine, ue *entity.User) (err error) {
err = client.MySQL.Table(p.TableName()).Where("wine_id = ? and user_id = ?", p.WineId, ue.Id).Delete(&p).Error
if err != nil {
log.Errorf("删除酒单失败：%s", err.Error())
return
}
return
}