|
@@ -124,6 +124,10 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx
|
|
a_times = common.ObjArrToStringArr((*data)["a_times"].([]interface{}))
|
|
a_times = common.ObjArrToStringArr((*data)["a_times"].([]interface{}))
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ power := make(map[int]bool)
|
|
|
|
+ for _, v := range powerData.Member.MemberPowerList {
|
|
|
|
+ power[common.IntAll(v)] = true
|
|
|
|
+ }
|
|
returnData := &bxsubscribe.PushSet{}
|
|
returnData := &bxsubscribe.PushSet{}
|
|
switch name {
|
|
switch name {
|
|
case "o_subset":
|
|
case "o_subset":
|
|
@@ -169,7 +173,7 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx
|
|
}
|
|
}
|
|
case "o_entinfo", "o_newproject_forecast":
|
|
case "o_entinfo", "o_newproject_forecast":
|
|
a_times = append(a_times, "实时推送")
|
|
a_times = append(a_times, "实时推送")
|
|
- if powerData.Member.Status > 0 {
|
|
|
|
|
|
+ if powerData.Member.Status > 0 && (power[9] || power[12]) {
|
|
if data == nil || len(*data) == 0 {
|
|
if data == nil || len(*data) == 0 {
|
|
returnData = &bxsubscribe.PushSet{
|
|
returnData = &bxsubscribe.PushSet{
|
|
ATimes: a_times,
|
|
ATimes: a_times,
|
|
@@ -193,10 +197,6 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx
|
|
return false, nil
|
|
return false, nil
|
|
}
|
|
}
|
|
case "o_week_report", "o_month_report":
|
|
case "o_week_report", "o_month_report":
|
|
- power := make(map[int]bool)
|
|
|
|
- for _, v := range powerData.Member.MemberPowerList {
|
|
|
|
- power[common.IntAll(v)] = true
|
|
|
|
- }
|
|
|
|
if powerData.Vip.Status > 0 || power[10] {
|
|
if powerData.Vip.Status > 0 || power[10] {
|
|
if name == "o_week_report" {
|
|
if name == "o_week_report" {
|
|
a_times = append(a_times, "每周推送 (周五 09:00)")
|
|
a_times = append(a_times, "每周推送 (周五 09:00)")
|