From ec2cedd5dcdd6060ce3eafed4dc5b58a7517945b Mon Sep 17 00:00:00 2001
From: dengbiao <“1239118001@qq.com”>
Date: Sat, 31 Aug 2024 17:22:18 +0800
Subject: [PATCH] update

---
 app/customer/svc/svc_pay.go | 104 +++++++++---------------------------
 1 file changed, 24 insertions(+), 80 deletions(-)

diff --git a/app/customer/svc/svc_pay.go b/app/customer/svc/svc_pay.go
index a3a9e1e..e3be7df 100644
--- a/app/customer/svc/svc_pay.go
+++ b/app/customer/svc/svc_pay.go
@@ -54,55 +54,27 @@ func BuyPackageForAli(c *gin.Context, req md.BuyPackageReq) (outTradeNo, tradeNo
 	var totalPrice float64
 	var data []*model.CentralKitchenForSchoolUserWithDay
 	if req.Kind == 1 {
-		if req.IsBuyByMealLabel {
-			totalPrice, data, err = CalcBySchoolTerm(user.Id, isTeacher, req)
-			if err != nil {
-				return
-			}
-		} else {
-			totalPrice, data, err = OldCalcBySchoolTerm(user.Id, isTeacher, req)
-			if err != nil {
-				return
-			}
+		totalPrice, data, err = CalcBySchoolTerm(user.Id, isTeacher, req)
+		if err != nil {
+			return
 		}
 	}
 	if req.Kind == 2 {
-		if req.IsBuyByMealLabel {
-			totalPrice, data, err = CalcByMonth(user.Id, isTeacher, req)
-			if err != nil {
-				return
-			}
-		} else {
-			totalPrice, data, err = OldCalcByMonth(user.Id, isTeacher, req)
-			if err != nil {
-				return
-			}
+		totalPrice, data, err = CalcByMonth(user.Id, isTeacher, req)
+		if err != nil {
+			return
 		}
 	}
 	if req.Kind == 3 {
-		if req.IsBuyByMealLabel {
-			totalPrice, data, err = CalcByDay(user.Id, isTeacher, req)
-			if err != nil {
-				return
-			}
-		} else {
-			totalPrice, data, err = OldCalcByDay(user.Id, isTeacher, req)
-			if err != nil {
-				return
-			}
+		totalPrice, data, err = CalcByDay(user.Id, isTeacher, req)
+		if err != nil {
+			return
 		}
 	}
 	if req.Kind == 4 {
-		if req.IsBuyByMealLabel {
-			totalPrice, data, err = CalcSupplementaryByDay(user.Id, isTeacher, req)
-			if err != nil {
-				return
-			}
-		} else {
-			totalPrice, data, err = OldCalcSupplementaryByDay(user.Id, isTeacher, req)
-			if err != nil {
-				return
-			}
+		totalPrice, data, err = CalcSupplementaryByDay(user.Id, isTeacher, req)
+		if err != nil {
+			return
 		}
 	}
 	total = utils.Float64ToStr(totalPrice)
@@ -197,55 +169,27 @@ func BuyPackageForWx(c *gin.Context, req md.BuyPackageReq) (outTradeNo, total st
 	var totalPrice float64
 	var data []*model.CentralKitchenForSchoolUserWithDay
 	if req.Kind == 1 {
-		if req.IsBuyByMealLabel {
-			totalPrice, data, err = CalcBySchoolTerm(user.Id, isTeacher, req)
-			if err != nil {
-				return
-			}
-		} else {
-			totalPrice, data, err = OldCalcBySchoolTerm(user.Id, isTeacher, req)
-			if err != nil {
-				return
-			}
+		totalPrice, data, err = CalcBySchoolTerm(user.Id, isTeacher, req)
+		if err != nil {
+			return
 		}
 	}
 	if req.Kind == 2 {
-		if req.IsBuyByMealLabel {
-			totalPrice, data, err = CalcByMonth(user.Id, isTeacher, req)
-			if err != nil {
-				return
-			}
-		} else {
-			totalPrice, data, err = OldCalcByMonth(user.Id, isTeacher, req)
-			if err != nil {
-				return
-			}
+		totalPrice, data, err = CalcByMonth(user.Id, isTeacher, req)
+		if err != nil {
+			return
 		}
 	}
 	if req.Kind == 3 {
-		if req.IsBuyByMealLabel {
-			totalPrice, data, err = CalcByDay(user.Id, isTeacher, req)
-			if err != nil {
-				return
-			}
-		} else {
-			totalPrice, data, err = OldCalcByDay(user.Id, isTeacher, req)
-			if err != nil {
-				return
-			}
+		totalPrice, data, err = CalcByDay(user.Id, isTeacher, req)
+		if err != nil {
+			return
 		}
 	}
 	if req.Kind == 4 {
-		if req.IsBuyByMealLabel {
-			totalPrice, data, err = CalcSupplementaryByDay(user.Id, isTeacher, req)
-			if err != nil {
-				return
-			}
-		} else {
-			totalPrice, data, err = OldCalcSupplementaryByDay(user.Id, isTeacher, req)
-			if err != nil {
-				return
-			}
+		totalPrice, data, err = CalcSupplementaryByDay(user.Id, isTeacher, req)
+		if err != nil {
+			return
 		}
 	}
 	total = utils.Float64ToStr(totalPrice)