|
|
@@ -57,12 +57,14 @@ func (this *UserAdminShareHistoryController) OrderList() {
|
|
|
var pars []interface{}
|
|
|
|
|
|
if startDate != "" && endDate != "" { //时间范围
|
|
|
+ startDate += " 00:00:00"
|
|
|
+ endDate += " 23:59:59"
|
|
|
condition += ` AND create_time BETWEEN ? AND ? `
|
|
|
pars = append(pars, startDate, endDate)
|
|
|
}
|
|
|
|
|
|
if adminId != "" { //所属销售筛选
|
|
|
- condition += ` AND seller_id IN (` + adminId + `) `
|
|
|
+ condition += ` AND share_id IN (` + adminId + `) `
|
|
|
}
|
|
|
|
|
|
if keyWord != "" { //用户姓名，手机号
|
|
|
@@ -102,10 +104,12 @@ func (this *UserAdminShareHistoryController) OrderList() {
|
|
|
|
|
|
for _, v := range list {
|
|
|
switch v.Source {
|
|
|
- case "article": //文章详情
|
|
|
+ case utils.CYGX_OBJ_ARTICLE: //文章详情
|
|
|
v.HttpUrl = utils.CYGX_MFYX_URL + "/material/info/" + strconv.Itoa(v.SourceId)
|
|
|
- case "activity": //活动详情
|
|
|
+ case utils.CYGX_OBJ_ACTIVITY: //活动详情
|
|
|
v.HttpUrl = utils.CYGX_MFYX_URL + "/activity/detail/" + strconv.Itoa(v.SourceId)
|
|
|
+ case utils.CYGX_OBJ_YANXUANSPECIAL: //研选专栏
|
|
|
+ v.HttpUrl = utils.CYGX_MFYX_URL + "/column/detail/" + strconv.Itoa(v.SourceId)
|
|
|
}
|
|
|
|
|
|
switch v.RegisterPlatform {
|
|
|
@@ -122,6 +126,7 @@ func (this *UserAdminShareHistoryController) OrderList() {
|
|
|
} else {
|
|
|
v.RealName = "--"
|
|
|
v.CompanyName = "--"
|
|
|
+ v.CompanyId = 1
|
|
|
}
|
|
|
}
|
|
|
page := paging.GetPaging(currentIndex, pageSize, total)
|
xingzai