From 6540dda2ff7db6f2e8d97f6d2eb602a94a311788 Mon Sep 17 00:00:00 2001 From: dengbiao <“1239118001@qq.com”> Date: Sat, 31 Aug 2024 19:37:03 +0800 Subject: [PATCH] 1 --- .../svc_central_kitchen_for_school_package.go | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/app/customer/svc/svc_central_kitchen_for_school_package.go b/app/customer/svc/svc_central_kitchen_for_school_package.go index 78aeffa..7d9de4f 100644 --- a/app/customer/svc/svc_central_kitchen_for_school_package.go +++ b/app/customer/svc/svc_central_kitchen_for_school_package.go @@ -36,7 +36,10 @@ func CalcBySchoolTerm(uid int, isTeacher bool, buyPackageReq md2.BuyPackageReq) //} mealLabelDb := db.MealLabelDb{} mealLabelDb.Set(buyPackageReq.EnterpriseId) - var mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner = model.MealLabel{}, model.MealLabel{}, model.MealLabel{} + var mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner *model.MealLabel + if isTeacher { + mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner = &model.MealLabel{}, &model.MealLabel{}, &model.MealLabel{} + } if !isTeacher && buyPackageReq.IsBuyBreakfast == 1{ mealLabelForBreakfast, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) if err != nil { @@ -197,7 +200,10 @@ func CalcByMonth(uid int, isTeacher bool, buyPackageReq md2.BuyPackageReq) (tota //} mealLabelDb := db.MealLabelDb{} mealLabelDb.Set(buyPackageReq.EnterpriseId) - var mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner = model.MealLabel{}, model.MealLabel{}, model.MealLabel{} + var mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner *model.MealLabel + if isTeacher { + mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner = &model.MealLabel{}, &model.MealLabel{}, &model.MealLabel{} + } if !isTeacher && buyPackageReq.IsBuyBreakfast == 1 { mealLabelForBreakfast, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) if err != nil { @@ -357,7 +363,10 @@ func CalcByDay(uid int, isTeacher bool, buyPackageReq md2.BuyPackageReq) (totalP //} mealLabelDb := db.MealLabelDb{} mealLabelDb.Set(buyPackageReq.EnterpriseId) - var mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner = model.MealLabel{}, model.MealLabel{}, model.MealLabel{} + var mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner *model.MealLabel + if isTeacher { + mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner = &model.MealLabel{}, &model.MealLabel{}, &model.MealLabel{} + } if !isTeacher && buyPackageReq.IsBuyBreakfast == 1 { mealLabelForBreakfast, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) if err != nil { @@ -497,7 +506,10 @@ func CalcSupplementaryByDay(uid int, isTeacher bool, buyPackageReq md2.BuyPackag //} mealLabelDb := db.MealLabelDb{} mealLabelDb.Set(buyPackageReq.EnterpriseId) - var mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner = model.MealLabel{}, model.MealLabel{}, model.MealLabel{} + var mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner *model.MealLabel + if isTeacher { + mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner = &model.MealLabel{}, &model.MealLabel{}, &model.MealLabel{} + } if !isTeacher && buyPackageReq.IsBuyBreakfast == 1 { mealLabelForBreakfast, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) if err != nil {