Merge branch 'dev/1.1.31_rjj' of BaseService/jyMicroservices into feature/v1.1.31

jyBXSubscribe/rpc/model/service/pushSet.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"app.yhyue.com/moapp/jybase/common"
+	"app.yhyue.com/moapp/jybase/go-xweb/log"
 	"bp.jydev.jianyu360.cn/BaseService/powerCheckCenter/rpc/pb"
 	"fmt"
 	IC "jyBXSubscribe/rpc/init"
@@ -134,6 +135,7 @@ func (this *PushSetService) Find() map[string]*bxsubscribe.PushSet {
 	if fool {
 		pushSet["o_msg_active"] = o_msg_active
 	}
+	log.Println("-----", o_pushset["o_msg_service"])
 	fool, o_msg_service := pushSetMontage(o_pushset["o_msg_service"], "o_msg_service", powerData, ShowWx)
 	if fool {
 		pushSet["o_msg_service"] = o_msg_service
@@ -152,6 +154,7 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx
 	data := common.ObjToMap(in)
 	a_times := []string{}
 	isMailShow := int64(1)
+	isReturnMailShow := true
 	if !(data == nil || len(*data) == 0) {
 		if (*data)["a_times"] != nil {
 			a_times = common.ObjArrToStringArr((*data)["a_times"].([]interface{}))
@@ -310,19 +313,25 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx
 			return false, nil
 		}
 	case "o_msg_active", "o_msg_service", "o_msg_jyschool", "o_msg_privateletter":
+		isReturnMailShow = false
+		log.Println("data", data)
 		if data == nil || len(*data) == 0 {
 			returnData = &bxsubscribe.PushSet{
 				IApppush: 0,
 				IWxpush:  0,
+				IsWxShow: 1,
 			}
 		} else {
 			returnData = &bxsubscribe.PushSet{
 				IApppush: common.Int64All(common.If((*data)["i_apppush"] == nil, 0, (*data)["i_apppush"])),
 				IWxpush:  common.Int64All(common.If((*data)["i_wxpush"] == nil, 0, (*data)["i_wxpush"])),
+				IsWxShow: 1,
 			}
 		}
 	}
-	returnData.IsMailShow = isMailShow
+	if isReturnMailShow {
+		returnData.IsMailShow = isMailShow
+	}
 	return true, returnData
 
 }