Merge branch 'feature/v1.0.4_wky' of BaseService/powerCheckCenter into feature/v1.0.4

entity/power.go

@@ -34,7 +34,7 @@ type Free struct {
 	Apppushunread         int64 //已读未读
 	OjyLength             int64 //ojy的长度
 	Original              int64 //查看原文次数/每月
-	PpStatus              int   //省份订阅包状态
+	PpStatus              int64 //省份订阅包状态
 	PpStartTime           int64 //省份订阅开始时间
 	PpEndTime             int64 //省份订阅到期时间
 }

rpc/internal/logic/checklogic.go

@@ -87,6 +87,9 @@ func (l *CheckLogic) Check(in *pb.CheckReq) (*pb.CheckResp, error) {
 			EntnicheApppushunread: data.Free.EntnicheApppushunread,
 			Apppushunread:         data.Free.Apppushunread,
 			Original:              data.Free.Original,
+			PpStatus:              data.Free.PpStatus,
+			PpStartTime:           data.Free.PpStartTime,
+			PpEndTime:             data.Free.PpEndTime,
 		}
 		resp.Ent = &pb.Ent{
 			Name:                data.Ent.Name,

service/power.go

@@ -151,7 +151,7 @@ func (this *PowerService) Power(userid string, baseUserId, accountId, entId, pos
 					free.IsUpgrade = true //新免费用户
 				}
 				//省份订阅包
-				free.PpStatus = common.IntAll(o_jy["i_ppstatus"])
+				free.PpStatus = common.Int64All(o_jy["i_ppstatus"])
 				free.PpStartTime = common.Int64All(o_jy["l_areaStart_p"])
 				free.PpEndTime = common.Int64All(o_jy["l_areaEnd_p"])
 				//超级订阅