新增字段

jyBXSubscribe/api/bxsubscribe.api

@@ -128,9 +128,8 @@ type (
 		UserId       string `header:"mgoUserId,optional"`
 		BaseUserId   int64  `header:"newUid,optional"`
 		ServiceType  string `json:"serviceType,optional"`
-		PositionId   int64  `json:"positionId,optiona"`
-		AccountId    int64  `json:"accountId,optiona"`
-		BaseUserId   int64  `json:"newUid,optiona"`
+		PositionId   int64  `header:"positionId,optiona"`
+		AccountId    int64  `header:"accountId,optiona"`
 	}
 	SetUserReq {
 		AppId        string `header:"appId"`

jyBXSubscribe/api/internal/logic/getUserLogic.go

@@ -2,7 +2,6 @@ package logic
 
 import (
 	"context"
-	"jyBXSubscribe/rpc/bxsubscribe"
 	"jyBXSubscribe/rpc/type/bxsubscribe"
 
 	"jyBXSubscribe/api/internal/svc"

jyBXSubscribe/api/internal/types/types.go

@@ -126,9 +126,8 @@ type GetUserReq struct {
 	UserId       string `header:"mgoUserId,optional"`
 	BaseUserId   int64  `header:"newUid,optional"`
 	ServiceType  string `json:"serviceType,optional"`
-	PositionId   int64  `json:"positionId,optiona"`
-	AccountId    int64  `json:"accountId,optiona"`
-	BaseUserId   int64  `json:"newUid,optiona"`
+	PositionId   int64  `header:"positionId,optiona"`
+	AccountId    int64  `header:"accountId,optiona"`
 }
 
 type SetUserReq struct {

jyBXSubscribe/rpc/internal/logic/userinfologic.go

@@ -32,7 +32,7 @@ func (l *UserInfoLogic) UserInfo(in *bxsubscribe.GetUserInfoReq) (*bxsubscribe.G
 	userInfo := &map[string]interface{}{}
 	s_email := ""
 	s_m_openid := ""
-	userInfo, _ = IC.Mgo.FindById(util.USER, in.MgoUserId, `{"o_pushset":1,"s_m_openid":1}`)
+	userInfo, _ = IC.Mgo.FindById(util.USER, in.UserId, `{"o_pushset":1,"s_m_openid":1}`)
 	if userInfo != nil && len(*userInfo) > 0 {
 		pushSet := common.ObjToMap((*userInfo)["o_pushset"])
 		s_email = common.InterfaceToStr((*pushSet)["s_email"])
@@ -59,7 +59,7 @@ func (l *UserInfoLogic) UserInfo(in *bxsubscribe.GetUserInfoReq) (*bxsubscribe.G
 	}
 	//用户二维码生成处理
 	data := map[string]string{
-		"userId": in.MgoUserId,
+		"userId": in.UserId,
 		"source": util.ServiceMap[in.ServiceType],
 	}
 	redis.Put("other", "Bind_"+common.InterfaceToStr(in.BaseUserId), data, -1)

jyBXSubscribe/rpc/model/service/pushSet.go

@@ -57,7 +57,7 @@ func (this *PushSetService) Find() map[string]*bxsubscribe.PushSet {
 	powerData := IC.Middleground.PowerCheckCenter.Check("10000", this.UserId, this.BaseUserId, this.AccountId, this.EntId, this.PositionType, this.PositionId)
 	if pushSetList != nil && len(*pushSetList) > 0 {
 		o_pushset, _ := (*pushSetList)["o_pushset"].(map[string]interface{})
-		fool, o_subset := pushSetMontage(o_pushset["o_pushset"], "o_pushset", powerData)
+		fool, o_subset := pushSetMontage(o_pushset["o_subset"], "o_subset", powerData)
 		if fool {
 			pushSet["o_subset"] = o_subset
 		}
@@ -83,7 +83,7 @@ func (this *PushSetService) Find() map[string]*bxsubscribe.PushSet {
 		}
 		fool, o_follow_ent := pushSetMontage(o_pushset["o_follow_ent"], "o_follow_ent", powerData)
 		if fool {
-			pushSet["o_entinfo"] = o_follow_ent
+			pushSet["o_follow_ent"] = o_follow_ent
 		}
 	}
 	return pushSet
@@ -91,8 +91,10 @@ func (this *PushSetService) Find() map[string]*bxsubscribe.PushSet {
 func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp) (bool, *bxsubscribe.PushSet) {
 	data := common.ObjToMap(in)
 	a_times := []string{}
-	if (*data)["a_times"] != nil {
-		a_times = common.ObjArrToStringArr((*data)["a_times"].([]interface{}))
+	if !(data == nil || len(*data) == 0) {
+		if (*data)["a_times"] != nil {
+			a_times = common.ObjArrToStringArr((*data)["a_times"].([]interface{}))
+		}
 	}
 	returnData := &bxsubscribe.PushSet{}
 	switch name {
@@ -109,14 +111,14 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp) (bool,
 		} else {
 			returnData = &bxsubscribe.PushSet{
 				ATimes:    a_times,
-				IApppush:  common.Int64All((*data)["i_apppush"]),
-				IWxpush:   common.Int64All((*data)["i_wxpush"]),
-				IMailpush: common.Int64All((*data)["i_mailpush"]),
-				IRatemode: common.Int64All((*data)["i_ratemode"]),
+				IApppush:  common.Int64All(common.If((*data)["i_apppush"] == nil, 1, (*data)["i_apppush"])),
+				IWxpush:   common.Int64All(common.If((*data)["i_wxpush"] == nil, 1, (*data)["i_wxpush"])),
+				IMailpush: common.Int64All(common.If((*data)["i_mailpush"] == nil, 0, (*data)["i_mailpush"])),
+				IRatemode: common.Int64All(common.If((*data)["i_ratemode"] == nil, 5, (*data)["i_ratemode"])),
 				IsWxShow:  1,
 			}
 		}
-	case "o_follow_projec", "follow":
+	case "o_follow_project", "o_follow_ent":
 		if data == nil || len(*data) == 0 {
 			returnData = &bxsubscribe.PushSet{
 				ATimes:    a_times,
@@ -129,14 +131,14 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp) (bool,
 		} else {
 			returnData = &bxsubscribe.PushSet{
 				ATimes:    a_times,
-				IApppush:  common.Int64All((*data)["i_apppush"]),
-				IWxpush:   common.Int64All((*data)["i_wxpush"]),
-				IMailpush: common.Int64All((*data)["i_mailpush"]),
+				IApppush:  common.Int64All(common.If((*data)["i_apppush"] == nil, 1, (*data)["i_apppush"])),
+				IWxpush:   common.Int64All(common.If((*data)["i_wxpush"] == nil, 1, (*data)["i_wxpush"])),
+				IMailpush: common.Int64All(common.If((*data)["i_mailpush"] == nil, 0, (*data)["i_mailpush"])),
 				IRatemode: 1,
 				IsWxShow:  1,
 			}
 		}
-	case "entinfo", "o_newproject_forecast":
+	case "o_entinfo", "o_newproject_forecast":
 		if powerData.Member.Status > 0 {
 			if data == nil || len(*data) == 0 {
 				returnData = &bxsubscribe.PushSet{
@@ -150,9 +152,9 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp) (bool,
 			} else {
 				returnData = &bxsubscribe.PushSet{
 					ATimes:    a_times,
-					IApppush:  common.Int64All((*data)["i_apppush"]),
-					IWxpush:   common.Int64All((*data)["i_wxpush"]),
-					IMailpush: common.Int64All((*data)["i_mailpush"]),
+					IApppush:  common.Int64All(common.If((*data)["i_apppush"] == nil, 1, (*data)["i_apppush"])),
+					IWxpush:   common.Int64All(common.If((*data)["i_wxpush"] == nil, 1, (*data)["i_wxpush"])),
+					IMailpush: common.Int64All(common.If((*data)["i_mailpush"] == nil, 0, (*data)["i_mailpush"])),
 					IRatemode: 1,
 					IsWxShow:  0,
 				}
@@ -166,16 +168,16 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp) (bool,
 			power[common.IntAll(v)] = true
 		}
 		if powerData.Vip.Status > 0 || power[10] {
+			if name == "o_week_report" {
+				a_times = append(a_times, "每周推送 (周五:09:00)")
+			} else {
+				a_times = append(a_times, "每月推送 (28日09:00)")
+			}
 			IsWxShow := int64(0)
 			if powerData.Vip.Status > 0 {
 				IsWxShow = int64(1)
 			}
 			if data == nil || len(*data) == 0 {
-				if name == "o_week_report" {
-					a_times = append(a_times, "每周推送 (周五:09:00)")
-				} else {
-					a_times = append(a_times, "每月推送 (28日09:00)")
-				}
 				returnData = &bxsubscribe.PushSet{
 					ATimes:    a_times,
 					IApppush:  1,