From 952caaaf91e7b7c58997bad0d755fe800a3f710f Mon Sep 17 00:00:00 2001
From: sxy <3187870250@qq.com>
Date: Fri, 20 Jun 2025 15:26:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A2=9E=E5=80=BC=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E4=BF=9D=E5=AD=98=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/logic/valueAddBundleLogic.go | 15 +++++++++------
 internal/model/valueAdd_bundle.go     |  2 +-
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/internal/logic/valueAddBundleLogic.go b/internal/logic/valueAddBundleLogic.go
index ba26279..d94ccde 100644
--- a/internal/logic/valueAddBundleLogic.go
+++ b/internal/logic/valueAddBundleLogic.go
@@ -150,12 +150,15 @@ func SaveValueAddService(in *bundle.ValueAddServiceLang) (res *bundle.SaveRespon
 		return res, errors.New("语言不能为空")
 	}
 	var options model.PriceOptions
-	if in.PriceMode == 1 && in.OriginalPrice == "" {
-		return res, errors.New("原价不能为空")
-	}
-	originalPrice, parseErr := strconv.ParseFloat(in.OriginalPrice, 32)
-	if parseErr != nil {
-		return res, errors.New("原价格式转换失败")
+	var originalPrice float64
+	if in.PriceMode == 1 {
+		if in.OriginalPrice == "" {
+			return res, errors.New("原价不能为空")
+		}
+		originalPrice, err = strconv.ParseFloat(in.OriginalPrice, 32)
+		if err != nil {
+			return res, errors.New("原价格式转换失败")
+		}
 	}
 	index := 1
 	for _, option := range in.Options {
diff --git a/internal/model/valueAdd_bundle.go b/internal/model/valueAdd_bundle.go
index 492cb03..e0874f0 100644
--- a/internal/model/valueAdd_bundle.go
+++ b/internal/model/valueAdd_bundle.go
@@ -130,7 +130,7 @@ func ValidateOptions(options PriceOptions) (bool, error) {
 		}
 		for _, n := range nums {
 			if _, exist := cover[n]; exist {
-				return false, errors.New("条件冲突")
+				return false, errors.New("条件存在冲突,请重新设置")
 
 			}
 			cover[n] = struct{}{}