|
|
@@ -471,9 +471,9 @@ func (service *ActivityServiceNew) GetAllLottery(in *activity.Request) (int64, s
|
|
|
//赠品、限时活动之外的活动
|
|
|
//2、先查找活动下的奖品Id
|
|
|
err = orm.Table("activity").Alias("a").
|
|
|
- Select("a.activityType as LotteryType,l.full,l.reducel,l.discount,d.useProductList as useProduct").
|
|
|
+ Select("a.activityType as LotteryType,l.full,l.reduce,l.discount,d.useProductList as useProduct").
|
|
|
Join("left", "discount d", "d.activityId=a.id and d.state=1").
|
|
|
- Join("left", "lottery l", " l.id = d.lotteryId ").
|
|
|
+ Join("left", "lottery l", " l.id = d.lotteryId and d.prizeId!=0 ").
|
|
|
Where("a.id = ? and a.appId=? ", activityId, in.AppId).Find(&lotteryJsonList)
|
|
|
if err != nil {
|
|
|
logx.Info("用户下的奖券查询失败：", err)
|
WH01243