wip:企业身份下查询个人身份下省份订阅包

service/power.go

@@ -263,6 +263,14 @@ func (this *PowerService) Power(userid string, baseUserId, accountId, entId, pos
 					"i_entid":  entId,
 					"i_userid": entnicheUserId,
 				})
+				//省份订阅包
+				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"])
+				if ppBuyset, _ := o_jy["o_buyset_p"].(map[string]interface{}); ppBuyset != nil && len(ppBuyset) > 0 {
+					free.PpAreaCount = common.Int64All(ppBuyset["areacount"])
+				}
+
 				if eudata != nil && len(*eudata) > 0 {
 					i_ts_guide := common.Int64All((*eudata)["i_ts_guide"])
 					free.TsGuide = i_ts_guide
@@ -326,19 +334,6 @@ func (this *PowerService) Power(userid string, baseUserId, accountId, entId, pos
 						FreeDownload: common.Int64All((*eudata)["i_doc_free_download"]),
 					}
 				}
-				//企业身份下查询个人身份下省份订阅包
-				mgoRes, _ := this.Conn.MgoJy.FindById("user", userid, `{"o_jy:1"}`)
-				if mgoRes != nil && len(*mgoRes) > 0 {
-					mgoRes_o_jy, _ := (*mgoRes)["o_jy"].(map[string]interface{})
-					//省份订阅包
-					free.PpStatus = common.Int64All(mgoRes_o_jy["i_ppstatus"])
-					free.PpStartTime = common.Int64All(mgoRes_o_jy["l_areaStart_p"])
-					free.PpEndTime = common.Int64All(mgoRes_o_jy["l_areaEnd_p"])
-
-					if ppBuyset, _ := mgoRes_o_jy["o_buyset_p"].(map[string]interface{}); ppBuyset != nil && len(ppBuyset) > 0 {
-						free.PpAreaCount = common.Int64All(ppBuyset["areacount"])
-					}
-				}
 			}
 			//大会员相关权益数量
 			memberServiceMap := map[int64]bool{}