tijiao

service/activityService.go

@@ -263,11 +263,7 @@ func (service *ActivityService) UserLottery(data *activity.Request) (int64, stri
 		NoLotteryHandle(data.ProductCode, data.UserId, data.AppId, &userLotteryList)
 	case 0:
 		//查看名下所有奖券
-<<<<<<<<< Temporary merge branch 1
-		count, err = orm.Table("user_prize").Alias("up").Select("DISTINCT up.activityId, d.useProductList as  userProduct,up.*,p.instructions,p.remark,p.prizeType as lotteryType").
-=========
 		count, err = orm.Table("user_prize").Alias("up").Select("DISTINCT up.activityId, d.useProductList as  userProduct,up.*,p.instructions,p.remark,p.prizeType as activityType").
->>>>>>>>> Temporary merge branch 2
 			Join("left", "prize p", "up.prizeId=p.id").
 			Join("left", "discount d", "up.lotteryId=d.lotteryId and  d.state=1").
 			Where("up.userId=? and  up.appId=?   and  up.prizeId!=0 and p.prizeType<2", data.UserId, data.AppId).Desc("up.createTime").
@@ -275,11 +271,7 @@ func (service *ActivityService) UserLottery(data *activity.Request) (int64, stri
 			FindAndCount(&userLotteryList)
 	case 2:
 		//过期的奖券
-<<<<<<<<< Temporary merge branch 1
-		count, err = orm.Table("user_prize").Alias("up").Select("DISTINCT up.activityId, d.useProductList as  userProduct,up.*,p.instructions,p.remark,p.prizeType as lotteryType").
-=========
 		count, err = orm.Table("user_prize").Alias("up").Select("DISTINCT up.activityId, d.useProductList as  userProduct,up.*,p.instructions,p.remark,p.prizeType as activityType").
->>>>>>>>> Temporary merge branch 2
 			Join("left", "prize p", "up.prizeId=p.id").
 			Join("left", "discount d", "up.lotteryId=d.lotteryId and  d.state=1").
 			Where("up.userId=? and  up.appId=?  and  up.prizeId!=0 and p.prizeType<2", data.UserId, data.AppId).
@@ -288,18 +280,13 @@ func (service *ActivityService) UserLottery(data *activity.Request) (int64, stri
 			FindAndCount(&userLotteryList)
 	case 3:
 		//已用的奖券
-<<<<<<<<< Temporary merge branch 1
-		count, err = orm.Table("user_prize").Alias("up").Select("DISTINCT up.activityId, d.useProductList as  userProduct,up.*,p.instructions,p.remark,p.prizeType as lotteryType").
-=========
 		count, err = orm.Table("user_prize").Alias("up").Select("DISTINCT up.activityId, d.useProductList as  userProduct,up.*,p.instructions,p.remark,p.prizeType as activityType").
->>>>>>>>> Temporary merge branch 2
 			Join("left", "prize p", "up.prizeId=p.id").
 			Join("left", "discount d", "up.lotteryId=d.lotteryId and  d.state=1").
 			Where("up.userId=? and  up.appId=? and  up.prizeId!=0 and (up.prizeType=1 or up.prizeType=3) and p.prizeType<2", data.UserId, data.AppId).
 			Desc("up.createTime").
 			Limit(int(data.PageSize), (int(data.Page-1))*int(data.PageSize)).FindAndCount(&userLotteryList)
-<<<<<<<<< Temporary merge branch 1
-=========
+
 		oneuserPrice := []entity.UserPrizeJson{}
 		count, err = orm.Table("user_prize").Alias("up").Select("DISTINCT up.activityId,a.activityType,d.useProductList as userProduct,d.promotionalPrice,d.discount,d.reduce,d.giftCode,up.*").
 			Join("left", "discount d", "up.lotteryId=d.id and  d.state=1").
@@ -310,7 +297,6 @@ func (service *ActivityService) UserLottery(data *activity.Request) (int64, stri
 		for _, prizeJson := range oneuserPrice {
 			userLotteryList = append(userLotteryList, prizeJson)
 		}
->>>>>>>>> Temporary merge branch 2
 	case 4:
 		//所有未使用奖券
 		count, err = orm.Table("user_prize").Alias("up").Select("DISTINCT up.activityId, d.useProductList as  userProduct, up.*,p.instructions,p.remark,p.prizeType as lotteryType ").
@@ -599,7 +585,7 @@ func (service *ActivityService) LotteryInfo(data *activity.Request) (int64, stri
 			Where("up.userId=? and  up.appId=? and up.prizeType=0 and  up.lotteryId=? and up.prizeId!=0", data.UserId, data.AppId, data.LotteryId).
 			Find(&userLotteryList)
 	} else {
-		err = orm.Table("activity").Alias("a").Select("d.giftCode,d.stockNumber,d.promotionalPrice,d.discount,d.reduce,g.name,a.beginDate,a.endDate,d.useProductList as userProduct,a.activityType as LotteryType").
+		err = orm.Table("activity").Alias("a").Select("d.giftCode,d.stockNumber,d.promotionalPrice,d.discount,d.reduce,g.name,a.beginDate,a.endDate,d.useProductList as userProduct,a.activityType as lotteryType").
 			Join("left", "discount d", "d.activityId = a.id ").
 			Join("left", "gift g ", "g.giftCode=d.giftCode").
 			Join("left", "product p", "FIND_IN_SET(p.ProductCode,d.useProductList )").