修改

model/activity.go

 package model
 package model
 
 
 type Activity struct {
 type Activity struct {
-	Id                 int64  `json:"id"`
-	SupplierIds        string `json:"supplier_ids"`
-	SupplierIdList     []string
-	SupplierType       int    `json:"supplier_type"`
-	UserScope          int    `json:"user_scope"`
-	SignText           string `json:"sign_text"`
-	BrandIds           string `json:"brand_ids"`
-	BrandIdList        []string
-	ClassIds           string `json:"class_ids"`
-	ClassIdList        []string
-	Canals             string `json:"canals"`
-	CanalList          []string
-	Ratio              float64 `json:"ratio"`
-	StartTime          int     `json:"start_time"`
-	EndTime            int     `json:"end_time"`
-	AddTime            int     `json:"add_time"`
-	UpdateTime         int     `json:"update_time"`
-	Status             int     `json:"status"`
-	AllowCoupon        int     `json:"allow_coupon"`
-	ActivityName       string  `json:"activity_name"`
-	ShowName           string  `json:"show_name"`
-	Sign               string  `json:"sign"`
-	ActivityType       int     `json:"activity_type"`
-	GoodsScope         int     `json:"goods_scope"`
-	ExcludeBrandIds    string  `json:"exclude_brand_ids"`
-	ExcludeBrandIdList []string
-	ExcludeSkuIds      string `json:"exclude_sku_ids"`
-	ExcludeSkuIdList   []string
-	SkuIds             string `json:"sku_ids"`
-	SkuIdList          []string
-	AdminId            int            `json:"admin_id"`
-	AdminName          string         `json:"admin_name"`
-	ActivityId         int            `json:"activity_id"`
-	ItemList           []ActivityItem `json:"item_list"`
-	EntireSupplierActivity bool `json:"entire_supplier_activity"`
+	Id                     int64  `json:"id"`
+	SupplierIds            string `json:"supplier_ids"`
+	SupplierIdList         []string
+	SupplierType           int    `json:"supplier_type"`
+	UserScope              int    `json:"user_scope"`
+	SignText               string `json:"sign_text"`
+	BrandIds               string `json:"brand_ids"`
+	BrandIdList            []string
+	ClassIds               string `json:"class_ids"`
+	ClassIdList            []string
+	Canals                 string `json:"canals"`
+	CanalList              []string
+	Ratio                  float64 `json:"ratio"`
+	StartTime              int     `json:"start_time"`
+	EndTime                int     `json:"end_time"`
+	AddTime                int     `json:"add_time"`
+	UpdateTime             int     `json:"update_time"`
+	Status                 int     `json:"status"`
+	AllowCoupon            int     `json:"allow_coupon"`
+	ActivityName           string  `json:"activity_name"`
+	ShowName               string  `json:"show_name"`
+	Sign                   string  `json:"sign"`
+	ActivityType           int     `json:"activity_type"`
+	GoodsScope             int     `json:"goods_scope"`
+	ExcludeBrandIds        string  `json:"exclude_brand_ids"`
+	ExcludeBrandIdList     []string
+	ExcludeSkuIds          string `json:"exclude_sku_ids"`
+	ExcludeSkuIdList       []string
+	SkuIds                 string `json:"sku_ids"`
+	SkuIdList              []string
+	AdminId                int            `json:"admin_id"`
+	AdminName              string         `json:"admin_name"`
+	ActivityId             int            `json:"activity_id"`
+	ItemList               []ActivityItem `json:"item_list"`
+	EntireSupplierActivity bool           `json:"entire_supplier_activity"`
 }
 }
 
 
 type ActivityItem struct {
 type ActivityItem struct {
 	ActivityId int     `json:"activity_id"`
 	ActivityId int     `json:"activity_id"`
 	Amount     float64 `json:"amount"`
 	Amount     float64 `json:"amount"`
 	Num        int     `json:"num"`
 	Num        int     `json:"num"`
+	Total      int     `json:"total"`
 	ItemName   string  `json:"item_name"`
 	ItemName   string  `json:"item_name"`
 	Pic        string  `json:"pic"`
 	Pic        string  `json:"pic"`
 	Remark     string  `json:"remark"`
 	Remark     string  `json:"remark"`
-	Content    string `json:"content"`
+	Content    string  `json:"content"`
 	AddTime    int     `json:"add_time"`
 	AddTime    int     `json:"add_time"`
 }
 }
 
 

service/service_activity.go

@@ -92,7 +92,7 @@ func (as *ActivityService) GetGiftActivity(checkData model.ActivityCheckData, ac
 		if hasActivity {
 		if hasActivity {
 			for key, item := range activity.ItemList {
 			for key, item := range activity.ItemList {
 				activity.ItemList[key].Content = "订单满" + gconv.String(item.Amount) + "元赠" +
 				activity.ItemList[key].Content = "订单满" + gconv.String(item.Amount) + "元赠" +
-					gconv.String(item.ItemName) + "X" + gconv.String(item.Num)
+					gconv.String(item.ItemName) + "X" + gconv.String(item.Num) + "" + item.Remark
 			}
 			}
 			giftActivity.ActivityName = activity.ActivityName
 			giftActivity.ActivityName = activity.ActivityName
 			giftActivity.ActivityId = activity.ActivityId
 			giftActivity.ActivityId = activity.ActivityId