Эх сурвалжийг харах

Merge remote-tracking branch 'origin/feature/v4.7.55' into feature/v4.7.55

# Conflicts:
#	src/jfw/modules/subscribepay/src/go.mod
#	src/jfw/modules/subscribepay/src/go.sum
WH01243 2 жил өмнө
parent
commit
5234db0f1c

+ 4 - 4
src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -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"]),

+ 3 - 1
src/jfw/modules/subscribepay/src/go.mod

@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a
-	app.yhyue.com/moapp/jypkg v0.0.0-20230207062117-298abaa4cdf8
+	app.yhyue.com/moapp/jypkg v0.0.0-20230207063159-81037e8f31e2
 	bp.jydev.jianyu360.cn/BaseService/pushpkg v0.0.0-20230203052057-bbba3a4671fd
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/dchest/captcha v1.0.0
@@ -80,11 +80,13 @@ require (
 	github.com/rivo/uniseg v0.2.0 // indirect
 	github.com/robfig/cron v1.2.0 // indirect
 	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	github.com/thinxer/go-word2vec v0.0.0-20150917053916-5c19ec7379ed // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
 	github.com/xdg-go/scram v1.1.1 // indirect
 	github.com/xdg-go/stringprep v1.0.3 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
 	github.com/zeromicro/go-zero v1.4.4 // indirect
+	github.com/ziutek/blas v0.0.0-20190227122918-da4ca23e90bb // indirect
 	go.etcd.io/etcd/api/v3 v3.5.5 // indirect
 	go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect
 	go.etcd.io/etcd/client/v3 v3.5.5 // indirect