From 025b72db876f5c572430256eb03aff83c416d05a Mon Sep 17 00:00:00 2001 From: Tooooommy Date: Thu, 22 Oct 2020 11:44:13 +0800 Subject: [PATCH] good rehearsal --- controllers/client/good.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/controllers/client/good.go b/controllers/client/good.go index 241c873..32f9cb3 100644 --- a/controllers/client/good.go +++ b/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,