|
@@ -36,7 +36,7 @@ func CalcBySchoolTerm(uid int, isTeacher bool, buyPackageReq md2.BuyPackageReq) |
|
|
//} |
|
|
//} |
|
|
mealLabelDb := db.MealLabelDb{} |
|
|
mealLabelDb := db.MealLabelDb{} |
|
|
mealLabelDb.Set(buyPackageReq.EnterpriseId) |
|
|
mealLabelDb.Set(buyPackageReq.EnterpriseId) |
|
|
var mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner *model.MealLabel |
|
|
|
|
|
|
|
|
var mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner = model.MealLabel{}, model.MealLabel{}, model.MealLabel{} |
|
|
if !isTeacher && buyPackageReq.IsBuyBreakfast == 1{ |
|
|
if !isTeacher && buyPackageReq.IsBuyBreakfast == 1{ |
|
|
mealLabelForBreakfast, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) |
|
|
mealLabelForBreakfast, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) |
|
|
if err != nil { |
|
|
if err != nil { |
|
@@ -197,7 +197,7 @@ func CalcByMonth(uid int, isTeacher bool, buyPackageReq md2.BuyPackageReq) (tota |
|
|
//} |
|
|
//} |
|
|
mealLabelDb := db.MealLabelDb{} |
|
|
mealLabelDb := db.MealLabelDb{} |
|
|
mealLabelDb.Set(buyPackageReq.EnterpriseId) |
|
|
mealLabelDb.Set(buyPackageReq.EnterpriseId) |
|
|
var mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner *model.MealLabel |
|
|
|
|
|
|
|
|
var mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner = model.MealLabel{}, model.MealLabel{}, model.MealLabel{} |
|
|
if !isTeacher && buyPackageReq.IsBuyBreakfast == 1 { |
|
|
if !isTeacher && buyPackageReq.IsBuyBreakfast == 1 { |
|
|
mealLabelForBreakfast, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) |
|
|
mealLabelForBreakfast, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) |
|
|
if err != nil { |
|
|
if err != nil { |
|
@@ -357,7 +357,7 @@ func CalcByDay(uid int, isTeacher bool, buyPackageReq md2.BuyPackageReq) (totalP |
|
|
//} |
|
|
//} |
|
|
mealLabelDb := db.MealLabelDb{} |
|
|
mealLabelDb := db.MealLabelDb{} |
|
|
mealLabelDb.Set(buyPackageReq.EnterpriseId) |
|
|
mealLabelDb.Set(buyPackageReq.EnterpriseId) |
|
|
var mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner *model.MealLabel |
|
|
|
|
|
|
|
|
var mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner = model.MealLabel{}, model.MealLabel{}, model.MealLabel{} |
|
|
if !isTeacher && buyPackageReq.IsBuyBreakfast == 1 { |
|
|
if !isTeacher && buyPackageReq.IsBuyBreakfast == 1 { |
|
|
mealLabelForBreakfast, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) |
|
|
mealLabelForBreakfast, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) |
|
|
if err != nil { |
|
|
if err != nil { |
|
@@ -497,7 +497,7 @@ func CalcSupplementaryByDay(uid int, isTeacher bool, buyPackageReq md2.BuyPackag |
|
|
//} |
|
|
//} |
|
|
mealLabelDb := db.MealLabelDb{} |
|
|
mealLabelDb := db.MealLabelDb{} |
|
|
mealLabelDb.Set(buyPackageReq.EnterpriseId) |
|
|
mealLabelDb.Set(buyPackageReq.EnterpriseId) |
|
|
var mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner *model.MealLabel |
|
|
|
|
|
|
|
|
var mealLabelForBreakfast, mealLabelForLunch, mealLabelForDinner = model.MealLabel{}, model.MealLabel{}, model.MealLabel{} |
|
|
if !isTeacher && buyPackageReq.IsBuyBreakfast == 1 { |
|
|
if !isTeacher && buyPackageReq.IsBuyBreakfast == 1 { |
|
|
mealLabelForBreakfast, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) |
|
|
mealLabelForBreakfast, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|