邮箱是否展示修改

jyBXSubscribe/rpc/bxsubscribe.proto

@@ -331,6 +331,7 @@ message PushSet{
   int64 i_ratemode = 5;
   int64 isWxShow = 6;
   int64 interested=7;
+  int64 isMailShow=8;
 }
 message SetPushSetReq{
   string  appId = 1;

jyBXSubscribe/rpc/model/service/pushSet.go

@@ -232,6 +232,10 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx
 		}
 	case "o_week_report", "o_month_report":
 		if powerData.Vip.Status > 0 || power[10] {
+			isMailShow := int64(0)
+			if power[10] {
+				isMailShow = int64(1)
+			}
 			if name == "o_week_report" {
 				a_times = append(a_times, "每周推送 (周五 09:00)")
 			} else {
@@ -243,21 +247,23 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx
 			}
 			if data == nil || len(*data) == 0 {
 				returnData = &bxsubscribe.PushSet{
-					ATimes:    a_times,
-					IApppush:  1,
-					IWxpush:   common.Int64All(common.If(ShowWx, 1, 0)),
-					IMailpush: 0,
-					IRatemode: 3,
-					IsWxShow:  IsWxShow,
+					ATimes:     a_times,
+					IApppush:   1,
+					IWxpush:    common.Int64All(common.If(ShowWx, 1, 0)),
+					IMailpush:  0,
+					IRatemode:  3,
+					IsWxShow:   IsWxShow,
+					IsMailShow: isMailShow,
 				}
 			} else {
 				returnData = &bxsubscribe.PushSet{
-					ATimes:    a_times,
-					IApppush:  common.Int64All(common.If((*data)["i_apppush"] == nil, 1, (*data)["i_apppush"])),
-					IWxpush:   common.Int64All(common.If((*data)["i_wxpush"] == nil, common.If(ShowWx, 1, 0), common.If(ShowWx, (*data)["i_wxpush"], 0))),
-					IMailpush: common.Int64All(common.If((*data)["i_mailpush"] == nil, 0, (*data)["i_mailpush"])),
-					IRatemode: 3,
-					IsWxShow:  IsWxShow,
+					ATimes:     a_times,
+					IApppush:   common.Int64All(common.If((*data)["i_apppush"] == nil, 1, (*data)["i_apppush"])),
+					IWxpush:    common.Int64All(common.If((*data)["i_wxpush"] == nil, common.If(ShowWx, 1, 0), common.If(ShowWx, (*data)["i_wxpush"], 0))),
+					IMailpush:  common.Int64All(common.If((*data)["i_mailpush"] == nil, 0, (*data)["i_mailpush"])),
+					IRatemode:  3,
+					IsWxShow:   IsWxShow,
+					IsMailShow: isMailShow,
 				}
 			}
 		} else {

jyBXSubscribe/rpc/type/bxsubscribe/bxsubscribe.pb.go

@@ -3220,6 +3220,7 @@ type PushSet struct {
 	IRatemode  int64    `protobuf:"varint,5,opt,name=i_ratemode,json=iRatemode,proto3" json:"i_ratemode,omitempty"`
 	IsWxShow   int64    `protobuf:"varint,6,opt,name=isWxShow,proto3" json:"isWxShow,omitempty"`
 	Interested int64    `protobuf:"varint,7,opt,name=interested,proto3" json:"interested,omitempty"`
+	IsMailShow int64    `protobuf:"varint,8,opt,name=isMailShow,proto3" json:"isMailShow,omitempty"`
 }
 
 func (x *PushSet) Reset() {
@@ -3303,6 +3304,13 @@ func (x *PushSet) GetInterested() int64 {
 	return 0
 }
 
+func (x *PushSet) GetIsMailShow() int64 {
+	if x != nil {
+		return x.IsMailShow
+	}
+	return 0
+}
+
 type SetPushSetReq struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -3880,7 +3888,7 @@ var file_bxsubscribe_proto_rawDesc = []byte{
 	0x6e, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x23, 0x0a, 0x08,
 	0x54, 0x69, 0x6d, 0x65, 0x4a, 0x73, 0x6f, 0x6e, 0x12, 0x17, 0x0a, 0x07, 0x61, 0x5f, 0x74, 0x69,
 	0x6d, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x61, 0x54, 0x69, 0x6d, 0x65,
-	0x73, 0x22, 0xd4, 0x01, 0x0a, 0x07, 0x50, 0x75, 0x73, 0x68, 0x53, 0x65, 0x74, 0x12, 0x17, 0x0a,
+	0x73, 0x22, 0xf4, 0x01, 0x0a, 0x07, 0x50, 0x75, 0x73, 0x68, 0x53, 0x65, 0x74, 0x12, 0x17, 0x0a,
 	0x07, 0x61, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06,
 	0x61, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x12, 0x19, 0x0a, 0x08, 0x69, 0x5f, 0x77, 0x78, 0x70, 0x75,
 	0x73, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x69, 0x57, 0x78, 0x70, 0x75, 0x73,
@@ -3893,7 +3901,9 @@ var file_bxsubscribe_proto_rawDesc = []byte{
 	0x69, 0x73, 0x57, 0x78, 0x53, 0x68, 0x6f, 0x77, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08,
 	0x69, 0x73, 0x57, 0x78, 0x53, 0x68, 0x6f, 0x77, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x6e, 0x74, 0x65,
 	0x72, 0x65, 0x73, 0x74, 0x65, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x6e,
-	0x74, 0x65, 0x72, 0x65, 0x73, 0x74, 0x65, 0x64, 0x22, 0xcf, 0x02, 0x0a, 0x0d, 0x53, 0x65, 0x74,
+	0x74, 0x65, 0x72, 0x65, 0x73, 0x74, 0x65, 0x64, 0x12, 0x1e, 0x0a, 0x0a, 0x69, 0x73, 0x4d, 0x61,
+	0x69, 0x6c, 0x53, 0x68, 0x6f, 0x77, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x69, 0x73,
+	0x4d, 0x61, 0x69, 0x6c, 0x53, 0x68, 0x6f, 0x77, 0x22, 0xcf, 0x02, 0x0a, 0x0d, 0x53, 0x65, 0x74,
 	0x50, 0x75, 0x73, 0x68, 0x53, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70,
 	0x70, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64,
 	0x12, 0x14, 0x0a, 0x05, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,