good rehearsal

controllers/client/good.go

@@ -114,7 +114,7 @@ func (t *GoodCtl) ListOrder() {
 	}
 
 	// todo: 直播没有彩排, 所以activity.rehearsal_id
-	orders, err := models.GetCustomerOrdersByActivityId(uid, activity.Id, 0, areaId, statusList, t.Page, t.PageSize, activity.ArchId)
+	orders, err := models.GetCustomerOrdersByActivityId(uid, activity.Id, activity.RehearsalId, areaId, statusList, t.Page, t.PageSize, activity.ArchId)
 	t.CheckErr(err)
 	orderIds := make([]int, 0)
 	for _, order := range orders {
@@ -246,12 +246,12 @@ func (t *GoodCtl) Order() {
 
 	// todo: 直播没有彩排
 	order := models.CustomerOrder{
-		OrderNo:    fmt.Sprint(define.DefaultOrderNo + int(count)),
-		ActivityId: activity.Id,
-		ArchId:     activity.ArchId,
-		AreaId:     area.Id,
-		AreaName:   area.Name,
-		// RehearsalId: activity.RehearsalId,
+		OrderNo:     fmt.Sprint(define.DefaultOrderNo + int(count)),
+		ActivityId:  activity.Id,
+		ArchId:      activity.ArchId,
+		AreaId:      area.Id,
+		AreaName:    area.Name,
+		RehearsalId: activity.RehearsalId,
 		BuyerId:     user.Id,
 		TotalAmount: float64(price)/100 + option.PostFee,
 		PayAmount:   float64(price)/100 + option.PostFee,