类型添加

jyBXSubscribe/rpc/model/push.go

@@ -378,7 +378,13 @@ func (s *subscribePush) getDatasFromMysql(spqp *SubPushQueryParam, starttime, en
 				userStr = fmt.Sprintf("   a.entid='%s'  and a.product < 1", spqp.EntId)
 			}
 		} else {
-			userStr = fmt.Sprintf("  a.userid='%s'", common.If(s.ModuleFlag == EntnicheFlag, spqp.EntUserId, common.InterfaceToStr(spqp.NewUserId)))
+			if spqp.UserType == SubVipFlag {
+				userStr = fmt.Sprintf("  a.userid='%s' and (a.product=1)", common.If(s.ModuleFlag == EntnicheFlag, spqp.EntUserId, common.InterfaceToStr(spqp.NewUserId)))
+			} else if spqp.UserType == MemberFlag {
+				userStr = fmt.Sprintf("  a.userid='%s' and (a.product=2)", common.If(s.ModuleFlag == EntnicheFlag, spqp.EntUserId, common.InterfaceToStr(spqp.NewUserId)))
+			} else {
+				userStr = fmt.Sprintf("  a.userid='%s' and (a.product<1)", common.If(s.ModuleFlag == EntnicheFlag, spqp.EntUserId, common.InterfaceToStr(spqp.NewUserId)))
+			}
 		}
 
 		//时间