diff --git a/controllers/client/login.go b/controllers/client/login.go index 5bcbf4f..62cd5b5 100644 --- a/controllers/client/login.go +++ b/controllers/client/login.go @@ -91,9 +91,6 @@ func (t *UserCtl) WxLogin() { exist, err = user.GetUserByOpenid(info.OpenId) t.CheckErr(err) - //user.ActivityId = activityId - //user.AreaId = area.Id - //user.AreaName = area.Name user.Nickname = info.Nickname user.Openid = info.OpenId user.Gender = func() string { diff --git a/controllers/client/order_entry.go b/controllers/client/order_entry.go index 6d8b769..f6373c3 100644 --- a/controllers/client/order_entry.go +++ b/controllers/client/order_entry.go @@ -325,10 +325,10 @@ func (t *OrderEntryCtl) ManualOrder() { } ms := make([]map[string]int, 0) - err = s.Table(&models.CustomerOrderSub{}).Alias("s").Select("s.goods_id, (COALESCE sum(goods_num), 0) as goods_num"). + err = s.Table(&models.CustomerOrderSub{}).Alias("s").Select("s.goods_id, COALESCE(SUM(s.goods_num), 0) as goods_num"). Join("left", (&models.CustomerOrder{}).Alias("o"), "o.id=s.order_id"). Where("o.activity_id=? and o.rehearsal_id=? and o.arch_id=?", activity.Id, activity.RehearsalId, activity.ArchId). - In("goods_id", goodIds).GroupBy("goods_id").Find(&ms) + In("s.goods_id", goodIds).GroupBy("s.goods_id").Find(&ms) if err != nil { s.Rollback() t.CheckErr(err)