|
|
@ -246,13 +246,13 @@ func (t *OrderDrawCtl) Users() { |
|
|
|
s = s.Table(&models.CustomerOrder{}).Alias("o").Select("o.buyer_id as user_id, "+ |
|
|
|
" o.phone, o.order_entry_person_name as entry_person_name, o.receiver as username"). |
|
|
|
Where("o.is_delete=0 and o.activity_id=? and o.rehearsal_id=? and o.arch_id=?", |
|
|
|
activityId, activity.RehearsalId, activity.ArchId) |
|
|
|
activity.Id, activity.RehearsalId, activity.ArchId) |
|
|
|
|
|
|
|
if moduleService.BesideRepeat == define.MODULE_BESIDE_REPEAT { |
|
|
|
recordIds := make([]int, 0) |
|
|
|
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, activity.RehearsalId, activity.ArchId).Find(&recordIds) |
|
|
|
Where("activity_id=? and rehearsal_id=? and arch_id=? and is_delete=0", |
|
|
|
activity.Id, activity.RehearsalId, activity.ArchId).Find(&recordIds) |
|
|
|
t.CheckErr(err) |
|
|
|
s = s.NotIn("o.id", recordIds) |
|
|
|
} |
|
|
|