|
|
|
@ -40,21 +40,24 @@ func GetSpecialOrderLottery(repeat string, activityId, ruleId, ladderId, rehears |
|
|
|
if repeat == define.MODULE_BESIDE_REPEAT { |
|
|
|
//查询已经中奖的用户，剔除已经中奖的用户
|
|
|
|
err = core.GetXormAuto().Table(&models.OrderDrawRecord{}).Select("customer_order_id"). |
|
|
|
Where("order_draw_rule_id=? and rehearsal_id=? and arch_id=? and is_delete=0", |
|
|
|
ruleId, rehearsalId, archId).Find(&recordIds) |
|
|
|
Where("activity_id=? and rehearsal_id=? and arch_id=? and is_delete=0", |
|
|
|
activityId, rehearsalId, archId).Find(&recordIds) |
|
|
|
} else { |
|
|
|
// 不去除
|
|
|
|
err = core.GetXormAuto().Table(&models.OrderDrawRecord{}).Select("customer_order_id"). |
|
|
|
Where("order_draw_rule_ladder_id=? and rehearsal_id=? and arch_id=? and is_delete=0", |
|
|
|
ladderId, rehearsalId, archId).Find(&recordIds) |
|
|
|
//err = core.GetXormAuto().Table(&models.OrderDrawRecord{}).Select("customer_order_id").
|
|
|
|
// Where("order_draw_rule_ladder_id=? and rehearsal_id=? and arch_id=? and is_delete=0",
|
|
|
|
// ladderId, rehearsalId, archId).Find(&recordIds)
|
|
|
|
} |
|
|
|
if err != nil { |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
|
|
|
|
err = core.GetXormAuto().NoAutoCondition().Where("activity_id=? and rehearsal_id=? and area_id=? "+ |
|
|
|
" and arch_id=? and is_delete=0", activityId, rehearsalId, areaId, archId). |
|
|
|
NotIn("id", recordIds).Find(&orders) |
|
|
|
s := core.GetXormAuto().NoAutoCondition().Where("activity_id=? and rehearsal_id=? and area_id=? "+ |
|
|
|
" and arch_id=? and is_delete=0", activityId, rehearsalId, areaId, archId) |
|
|
|
defer s.Close() |
|
|
|
if len(recordIds) > 0 { |
|
|
|
s.NotIn("id", recordIds) |
|
|
|
} |
|
|
|
err = s.Find(&orders) |
|
|
|
if err != nil { |
|
|
|
return nil, err |
|
|
|
} |
|
|
|
|
