|
@@ -17,7 +17,7 @@ import (
|
|
|
. "app.yhyue.com/moapp/jybase/date"
|
|
|
"app.yhyue.com/moapp/jybase/redis"
|
|
|
"app.yhyue.com/moapp/jypkg/common/src/qfw/util/jy"
|
|
|
-
|
|
|
+ "app.yhyue.com/moapp/jypkg/public"
|
|
|
"go.mongodb.org/mongo-driver/bson"
|
|
|
)
|
|
|
|
|
@@ -599,15 +599,15 @@ func (this *vipSubscribeStruct) SubChange(userId string, oldVip, areaNew *map[st
|
|
|
// 获取省份,城市,行业购买内容
|
|
|
// [省份,城市,行业]
|
|
|
func (this *vipSubscribeStruct) GetVipDetail(userId string) (*map[string]interface{}, *SubvipBuySet, bool) {
|
|
|
- mData, ok := util.MQFW.FindById("user", userId, `{"o_vipjy":1,"i_vip_status":1,"l_vip_endtime":1,"l_vip_starttime":1,"isread":1}`)
|
|
|
- if !ok || len(*mData) == 0 || mData == nil {
|
|
|
+ mData := public.GetCompatibleUser(&util.MQFW, userId, map[string]int{"o_vipjy": 1, "i_vip_status": 1, "l_vip_endtime": 1, "l_vip_starttime": 1, "isread": 1})
|
|
|
+ if len(*mData) == 0 {
|
|
|
return nil, nil, false
|
|
|
}
|
|
|
//是否处于vip状态
|
|
|
vipStatus := qutil.IntAll((*mData)["i_vip_status"])
|
|
|
tmp := qutil.ObjToMap((*qutil.ObjToMap((*mData)["o_vipjy"]))["o_buyset"])
|
|
|
|
|
|
- newCity, ok := (*tmp)["newcitys"].([]interface{})
|
|
|
+ newCity, _ := (*tmp)["newcitys"].([]interface{})
|
|
|
|
|
|
return mData, &SubvipBuySet{
|
|
|
qutil.IntAll((*tmp)["upgrade"]),
|