默认值处理

jyBXSubscribe/rpc/model/service/pushSet.go

@@ -140,7 +140,7 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx
 			returnData = &bxsubscribe.PushSet{
 				ATimes:    common.If((*data)["i_ratemode"] == nil, util.TimeMap[2], a_times).([]string),
 				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"])),
+				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: common.Int64All(common.If((*data)["i_ratemode"] == nil, 2, (*data)["i_ratemode"])),
 				IsWxShow:  1,
@@ -161,7 +161,7 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx
 			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, 1, (*data)["i_wxpush"])),
+				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: 1,
 				IsWxShow:  1,
@@ -183,7 +183,7 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx
 				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, 1, (*data)["i_wxpush"])),
+					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: 1,
 					IsWxShow:  0,
@@ -219,9 +219,9 @@ func pushSetMontage(in interface{}, name string, powerData *pb.CheckResp, ShowWx
 			} 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, 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,
 				}