From 27daf6873630d6fc5e1d6c9f1c3b81afc80e49b3 Mon Sep 17 00:00:00 2001
From: loser <1711788888@qq.com>
Date: Thu, 27 Apr 2023 18:02:38 +0800
Subject: [PATCH] :bug: fix bug

---
 api/app/wine.go          | 8 +++++++-
 model/entity/material.go | 2 +-
 repository/wine.go       | 8 ++++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/api/app/wine.go b/api/app/wine.go
index d4b9046..39a554d 100644
--- a/api/app/wine.go
+++ b/api/app/wine.go
@@ -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
 	}
diff --git a/model/entity/material.go b/model/entity/material.go
index 707d10f..5b70fb7 100644
--- a/model/entity/material.go
+++ b/model/entity/material.go
@@ -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"`
 }
diff --git a/repository/wine.go b/repository/wine.go
index 2cd89b5..24af075 100644
--- a/repository/wine.go
+++ b/repository/wine.go
@@ -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
 }