|
@@ -48,7 +48,7 @@ func CalcBySchoolTerm(uid int, isTeacher bool, buyPackageReq md2.BuyPackageReq) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if buyPackageReq.IsBuyLunch == 1 { |
|
|
if buyPackageReq.IsBuyLunch == 1 { |
|
|
mealLabelForLunch, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) |
|
|
|
|
|
|
|
|
mealLabelForLunch, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForLunch) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
@@ -58,7 +58,7 @@ func CalcBySchoolTerm(uid int, isTeacher bool, buyPackageReq md2.BuyPackageReq) |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if buyPackageReq.IsBuyDinner == 1 { |
|
|
if buyPackageReq.IsBuyDinner == 1 { |
|
|
mealLabelForDinner, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) |
|
|
|
|
|
|
|
|
mealLabelForDinner, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForDinner) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
@@ -209,7 +209,7 @@ func CalcByMonth(uid int, isTeacher bool, buyPackageReq md2.BuyPackageReq) (tota |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if buyPackageReq.IsBuyLunch == 1 { |
|
|
if buyPackageReq.IsBuyLunch == 1 { |
|
|
mealLabelForLunch, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) |
|
|
|
|
|
|
|
|
mealLabelForLunch, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForLunch) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
@@ -219,7 +219,7 @@ func CalcByMonth(uid int, isTeacher bool, buyPackageReq md2.BuyPackageReq) (tota |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if buyPackageReq.IsBuyDinner == 1 { |
|
|
if buyPackageReq.IsBuyDinner == 1 { |
|
|
mealLabelForDinner, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) |
|
|
|
|
|
|
|
|
mealLabelForDinner, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForDinner) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
@@ -369,7 +369,7 @@ func CalcByDay(uid int, isTeacher bool, buyPackageReq md2.BuyPackageReq) (totalP |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if buyPackageReq.IsBuyLunch == 1 { |
|
|
if buyPackageReq.IsBuyLunch == 1 { |
|
|
mealLabelForLunch, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) |
|
|
|
|
|
|
|
|
mealLabelForLunch, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForLunch) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
@@ -379,7 +379,7 @@ func CalcByDay(uid int, isTeacher bool, buyPackageReq md2.BuyPackageReq) (totalP |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if buyPackageReq.IsBuyDinner == 1 { |
|
|
if buyPackageReq.IsBuyDinner == 1 { |
|
|
mealLabelForDinner, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) |
|
|
|
|
|
|
|
|
mealLabelForDinner, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForDinner) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
@@ -509,7 +509,7 @@ func CalcSupplementaryByDay(uid int, isTeacher bool, buyPackageReq md2.BuyPackag |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if buyPackageReq.IsBuyLunch == 1 { |
|
|
if buyPackageReq.IsBuyLunch == 1 { |
|
|
mealLabelForLunch, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) |
|
|
|
|
|
|
|
|
mealLabelForLunch, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForLunch) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
@@ -519,7 +519,7 @@ func CalcSupplementaryByDay(uid int, isTeacher bool, buyPackageReq md2.BuyPackag |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if buyPackageReq.IsBuyDinner == 1 { |
|
|
if buyPackageReq.IsBuyDinner == 1 { |
|
|
mealLabelForDinner, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForBreakfast) |
|
|
|
|
|
|
|
|
mealLabelForDinner, err = mealLabelDb.GetMealLabel(buyPackageReq.MealLabelIdForDinner) |
|
|
if err != nil { |
|
|
if err != nil { |
|
|
return |
|
|
return |
|
|
} |
|
|
} |
|
|