kobe6258 4 сар өмнө
parent
commit
9294d8dadb
1 өөрчлөгдсөн 11 нэмэгдсэн , 37 устгасан
  1. 11 37
      controllers/product.go

+ 11 - 37
controllers/product.go

@@ -565,7 +565,6 @@ func (this *ProductController) EditProduct() {
 		this.ServeJSON()
 	}()
 	var req request.ProductReq
-	var permissionName string
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常!"
@@ -614,7 +613,7 @@ func (this *ProductController) EditProduct() {
 	case "video":
 		product.RiskLevel, product.Title, err = services.GetRiskLevel("video", req.SourceId)
 	case "package":
-		product.RiskLevel, permissionName, err = services.GetRiskLevel("package", req.SourceId)
+		product.RiskLevel, _, err = services.GetRiskLevel("package", req.SourceId)
 	default:
 		br.Msg = "产品类型错误"
 		br.ErrMsg = "获取产品列表失败,Err:产品类型错误"
@@ -622,17 +621,17 @@ func (this *ProductController) EditProduct() {
 	}
 
 	if err != nil {
-		utils.FileLog.Error("新增单品失败", err.Error())
-		br.Msg = "新增产品错误"
+		utils.FileLog.Error("编辑产品失败", err.Error())
+		br.Msg = "编辑产品失败"
 		if strings.Contains(err.Error(), "<QuerySeter> no row found") {
-			br.Msg = "新增产品错误,产品信息不存在"
+			br.Msg = "编辑产品失败,产品信息不存在"
 		} else {
-			br.Msg = "新增产品错误" + err.Error()
+			br.Msg = "编辑产品失败" + err.Error()
 		}
 		return
 	}
 	if product.RiskLevel == "" {
-		br.Msg = "新增产品错误"
+		br.Msg = "编辑产品失败"
 		br.ErrMsg = "未获取到风险等级"
 		return
 	}
@@ -665,45 +664,20 @@ func (this *ProductController) EditProduct() {
 	product.Type = models.MerchantProductType(req.Type)
 	product.Creator = this.SysUser.SysRealName
 	if product.Type == "" {
-		br.Msg = "新增产品错误"
+		br.Msg = "编辑产品失败"
 		br.ErrMsg = "产品类型为空"
 		return
 	}
 
 	err = product.EditProduct()
 	if err != nil {
-		var mysqlErr *mysql.MySQLError
-		if errors.As(err, &mysqlErr) {
-			if mysqlErr.Number == 1062 {
-				if product.Type == models.ProductPackage {
-					var dbProduct models.MerchantProduct
-					dbProduct, err = models.GetProductByProductType(product.SourceId, models.ProductPackage)
-					if err != nil {
-						utils.FileLog.Error("获取套餐产品信息失败,err:" + err.Error())
-						br.Msg = "[" + permissionName + "]已设置付费套餐,请重新选择"
-						br.ErrMsg = "[" + permissionName + "]已设置付费套餐,请重新选择"
-					} else {
-						br.Msg = "[" + permissionName + "]已设置付费套餐[" + dbProduct.Title + "],请重新选择"
-						br.ErrMsg = "[" + permissionName + "]已设置付费套餐[" + dbProduct.Title + "],请重新选择"
-					}
-				} else {
-					br.Msg = "该产品已设置付费,请刷新后重试"
-					br.ErrMsg = "该产品已设置付费,请刷新后重试"
-				}
-			} else {
-				utils.FileLog.Error("新增产品失败,err:" + err.Error())
-				br.Msg = "新增产品失败"
-				br.ErrMsg = "新增产品失败,err:" + err.Error()
-			}
-		} else {
-			utils.FileLog.Error("新增产品失败,err:" + err.Error())
-			br.Msg = "新增产品失败"
-			br.ErrMsg = "新增产品失败,err:" + err.Error()
-		}
+		utils.FileLog.Error("编辑产品失败,err:" + err.Error())
+		br.Msg = "编辑产品失败"
+		br.ErrMsg = "编辑产品失败,err:" + err.Error()
 		return
 	}
 	br.Ret = 200
 	br.Success = true
-	br.Msg = "新增产品成功"
+	br.Msg = "编辑产品成功"
 	return
 }