From a3197b7d55575cb1e93db716724bad74e736ae9a Mon Sep 17 00:00:00 2001 From: momo <1012651275@qq.com> Date: Tue, 24 Oct 2023 15:37:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E8=AE=A2=E5=8D=95=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- service/repositories/order.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/service/repositories/order.go b/service/repositories/order.go index 799a266b..39172321 100644 --- a/service/repositories/order.go +++ b/service/repositories/order.go @@ -378,12 +378,12 @@ func (d *defaultOrder) Invoice(ctx context.Context, in *InvoiceReq) (res *Invoic zipCode = ress.OrderDetail.DeliveryAddress.ZipCode } else { // 邮箱 - model1 := d.MysqlConn.Where("is_del = ?", 0).Model(&gmodel.FsUser{}) + modelUser := d.MysqlConn.Model(&gmodel.FsUser{}) if in.UserId != 0 { - model1 = model.Where("user_id = ?", in.UserId) + modelUser = modelUser.Where("id = ?", in.UserId) } - var userInfo = gmodel.FsUser{} - result1 := model1.Take(&userInfo) + var userInfo = &gmodel.FsUser{} + result1 := modelUser.Debug().Take(&userInfo) if result1.Error != nil { if errors.Is(result1.Error, gorm.ErrRecordNotFound) { errorCode = *basic.CodeErrOrderCreatePrePaymentInfoNoFound @@ -395,7 +395,9 @@ func (d *defaultOrder) Invoice(ctx context.Context, in *InvoiceReq) (res *Invoic ErrorCode: errorCode, }, result1.Error } - name = *userInfo.Email + if userInfo.Email != nil { + name = *userInfo.Email + } } var products string