zhangchuanxing преди 2 седмици
родител
ревизия
adafd5a7d8
променени са 1 файла, в които са добавени 21 реда и са изтрити 8 реда
  1. 21 8
      controllers/roadshow/activity.go

+ 21 - 8
controllers/roadshow/activity.go

@@ -310,7 +310,7 @@ func (this *ActivityController) List() {
 
 // @Title 活动详情
 // @Description 活动详情接口
-// @Param   RsActivitySellerId   query   int  true       "活动销售id"
+// @Param   RsActivityId   query   int  true       "活动销售id"
 // @Success 200 {object} rs.RsActivityDetailResp
 // @router /activity/detail [get]
 func (this *ActivityController) ActivityDetail() {
@@ -319,7 +319,25 @@ func (this *ActivityController) ActivityDetail() {
 		this.FailWithMessage("请登录", "请登录,SysUser Is Empty")
 		return
 	}
-	rsActivitySellerId, _ := this.GetInt("RsActivitySellerId")
+	rsActivityId, _ := this.GetInt("RsActivityId")
+	rsActivityItem, err := roadshow.GetRsActivityByRsActivityId(rsActivityId)
+	if err != nil {
+		this.FailWithMessage("获取数据失败", "获取数据失败!GetRsActivityByRsActivityId:"+err.Error())
+		return
+	}
+
+	//获取对应的多个销售信息
+	listSeller, err := roadshow.GetRsActivitySellerListByActivityIds([]int{rsActivityId})
+	if err != nil {
+		this.FailWithMessage("删除失败!", "获取数据失败!GetRsActivitySellerListByActivityIds Err:"+err.Error())
+		return
+	}
+	mapSeller := []string{}
+	var rsActivitySellerId int
+	for _, v := range listSeller {
+		mapSeller = append(mapSeller, v.SellerName)
+		rsActivitySellerId = v.RsActivitySellerId
+	}
 
 	if rsActivitySellerId <= 0 {
 		this.FailWithMessage("参数错误", "rsActivitySellerId 为零")
@@ -331,12 +349,7 @@ func (this *ActivityController) ActivityDetail() {
 		this.FailWithMessage("获取数据失败", "获取数据失败!GetRsActivitySellerById:"+err.Error())
 		return
 	}
-
-	rsActivityItem, err := roadshow.GetRsActivityByRsActivityId(rsActivitySellerItem.RsActivityId)
-	if err != nil {
-		this.FailWithMessage("获取数据失败", "获取数据失败!GetRsActivityByRsActivityId:"+err.Error())
-		return
-	}
+	rsActivitySellerItem.SellerName = strings.Join(mapSeller, ",")
 
 	companyDetailView := new(roadshow.CompanyDetailView)
 	productId := services.GetProductId(sysUser.RoleTypeCode)