Commit 08779c31 by mushishixian

修改

parent a77d9f3f
...@@ -42,6 +42,7 @@ type ActivityItem struct { ...@@ -42,6 +42,7 @@ 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"`
......
...@@ -92,7 +92,7 @@ func (as *ActivityService) GetGiftActivity(checkData model.ActivityCheckData, ac ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment