WH01243 2 gadi atpakaļ
vecāks
revīzija
4730df2126

+ 1 - 1
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-20230207082022-e4d33621d394
+	app.yhyue.com/moapp/jypkg v0.0.0-20230209022443-283a80f1b7fa
 	bp.jydev.jianyu360.cn/BaseService/userCenter v0.0.0-20230129060002-f69424aa14ba
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/dchest/captcha v1.0.0

+ 2 - 2
src/go.sum

@@ -13,8 +13,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20220802080941-07f401baab8b/go.mod h1:HelrO6tc
 app.yhyue.com/moapp/jybase v0.0.0-20230109015757-aa3d5e19b196/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a h1:wD4aWPSYdiX1cIP4lzzPD2s7fYhKa3muIf97l9tonJE=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
-app.yhyue.com/moapp/jypkg v0.0.0-20230207082022-e4d33621d394 h1:vhCsUAxF1ZIUPucSXhDZYNBWHDX2+usz+pU/T2Xu184=
-app.yhyue.com/moapp/jypkg v0.0.0-20230207082022-e4d33621d394/go.mod h1:0DqPlGxaufZlKaLoRndTWG4j3qUQqJ6MNZCmoPcMqSg=
+app.yhyue.com/moapp/jypkg v0.0.0-20230209022443-283a80f1b7fa h1:0/2I4ubgDsRbKm7PeiVSTvYwZCK3anZQaEagsGBbI7E=
+app.yhyue.com/moapp/jypkg v0.0.0-20230209022443-283a80f1b7fa/go.mod h1:0DqPlGxaufZlKaLoRndTWG4j3qUQqJ6MNZCmoPcMqSg=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=

+ 1 - 1
src/jfw/modules/app/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-20230207063159-81037e8f31e2
+	app.yhyue.com/moapp/jypkg v0.0.0-20230209022443-283a80f1b7fa
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13-0.20230207022117-85952189304d
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/dchest/captcha v1.0.0

+ 1 - 1
src/jfw/modules/bigmember/src/go.mod

@@ -5,7 +5,7 @@ go 1.18
 require (
 	app.yhyue.com/moapp/esv1 v0.0.0-20220414031211-3da4123e648d
 	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-20230209022443-283a80f1b7fa
 	github.com/donnie4w/go-logger v0.0.0-20170827050443-4740c51383f4
 	github.com/gogf/gf/v2 v2.0.6
 	go.mongodb.org/mongo-driver v1.11.1

+ 1 - 1
src/jfw/modules/distribution/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-20230209022443-283a80f1b7fa
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	github.com/gogf/gf/v2 v2.0.6
 	github.com/tealeg/xlsx v1.0.5

+ 2 - 2
src/jfw/modules/subscribepay/src/active/active.go

@@ -46,8 +46,8 @@ func (this *Active) IsActiving(activeName string) {
 			if ActiveConfig.DoubleEleven.Active_Start < now.Unix() && ActiveConfig.DoubleEleven.Active_End > now.Unix() {
 				res["isActiving"] = true
 				if userId != "" {
-					data, ok := util.MQFW.FindById("user", userId, nil)
-					if ok && data != nil && *data != nil {
+					data := util.Compatible.Select(userId, `"i_member_give":1`)
+					if data != nil && *data != nil {
 						//已录入信息 已激活大会员赠送
 						if (*data)["i_member_give"] != nil {
 							res["isWritten"] = qutil.IntAll((*data)["i_member_give"])

+ 6 - 24
src/jfw/modules/subscribepay/src/entity/subscribeVip.go

@@ -549,28 +549,10 @@ func (this *vipSubscribeStruct) CanTrial(userId string, session *httpsession.Ses
 // 订阅修改
 func (this *vipSubscribeStruct) SubChange(userId string, oldVip, areaNew *map[string]interface{}, industryNew []string, session *httpsession.Session) bool {
 	updateOk := false
-	positionType := qutil.IntAll(session.Get("positionType"))
-	if positionType == 0 {
-		updateOk = util.MQFW.UpdateById("user", userId,
-			bson.M{"$set": bson.M{
-				"o_vipjy.o_area":       areaNew,     //设置地区
-				"o_vipjy.a_buyerclass": industryNew, //设置行业
-			}})
-	} else {
-		entUserId := qutil.IntAll(session.Get("entUserId"))
-		entId := qutil.IntAll(session.Get("entId"))
-		query := map[string]interface{}{
-			"i_userid": entUserId,
-			"i_entid":  entId,
-			"i_type":   1,
-		}
-		updateOk = util.MQFW.Update("entniche_rule", query,
-			bson.M{"$set": bson.M{
-				"o_entniche.o_area":       areaNew,     //设置地区
-				"o_entniche.a_buyerclass": industryNew, //设置行业
-			}}, true, false)
-	}
-
+	util.Compatible.Update(userId, bson.M{"$set": bson.M{
+		"o_vipjy.o_area":       areaNew,     //设置地区
+		"o_vipjy.a_buyerclass": industryNew, //设置行业
+	}})
 	if !updateOk {
 		return false
 	} else {
@@ -886,8 +868,8 @@ func PayCancel(userId, product_type, entname string) bool {
 
 // 双十一活动 判断用户是否已经获得赠送周期资格
 func (this *vipSubscribeStruct) IsHaveCycle(userId string) bool {
-	data, ok := util.MQFW.FindById("user", userId, `{"i_member_give":1}`)
-	if ok {
+	data := util.Compatible.Select(userId, `{"i_member_give":1}`)
+	if data != nil && len(*data) > 0 {
 		if (*data)["i_member_give"] == nil {
 			return true
 		}

+ 1 - 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-20230208110901-e72924b35a56
+	app.yhyue.com/moapp/jypkg v0.0.0-20230209022443-283a80f1b7fa
 	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

+ 2 - 2
src/jfw/modules/subscribepay/src/go.sum

@@ -13,8 +13,8 @@ app.yhyue.com/moapp/jybase v0.0.0-20220802080941-07f401baab8b/go.mod h1:HelrO6tc
 app.yhyue.com/moapp/jybase v0.0.0-20230109015757-aa3d5e19b196/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a h1:wD4aWPSYdiX1cIP4lzzPD2s7fYhKa3muIf97l9tonJE=
 app.yhyue.com/moapp/jybase v0.0.0-20230117032034-ad7c00ffe11a/go.mod h1:zB47XTeJvpcbtBRYgkQuxOICWNexiZfbUO+7aUf6mNs=
-app.yhyue.com/moapp/jypkg v0.0.0-20230208110901-e72924b35a56 h1:wPhT8N4Ds9j2j2HEsBna1H3+dSf3Yi7LARV8EMzYsmU=
-app.yhyue.com/moapp/jypkg v0.0.0-20230208110901-e72924b35a56/go.mod h1:0DqPlGxaufZlKaLoRndTWG4j3qUQqJ6MNZCmoPcMqSg=
+app.yhyue.com/moapp/jypkg v0.0.0-20230209022443-283a80f1b7fa h1:0/2I4ubgDsRbKm7PeiVSTvYwZCK3anZQaEagsGBbI7E=
+app.yhyue.com/moapp/jypkg v0.0.0-20230209022443-283a80f1b7fa/go.mod h1:0DqPlGxaufZlKaLoRndTWG4j3qUQqJ6MNZCmoPcMqSg=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae h1:6rDDaz6yxvE8viTSzEBwKYOFWq14TMfuBivSazUZMz4=
 app.yhyue.com/moapp/message v0.0.0-20221223100203-6402e389d9ae/go.mod h1:b0zZHev3gmJao1Fo+2Z2KPVjsuLOJVvVxf+kCnu9WkA=
 bp.jydev.jianyu360.cn/BP/jynsq v0.0.0-20220222052708-ebc43af90698/go.mod h1:ojo/AUH9Yr1wzarEjOaNMkj1Cet/9r8IgLyba64Z52E=

+ 12 - 12
src/jfw/modules/subscribepay/src/service/afterPay.go

@@ -195,7 +195,7 @@ func (a *AfterPay) DirectSubKWS() error {
 		}
 		vip_lock.Lock.Lock()
 		defer vip_lock.Lock.Unlock()
-		data, ok := util.MQFW.FindById("user", userId, `{"o_vipjy":1}`)
+		data := util.Compatible.Select(userId, `{"o_vipjy":1}`)
 		keys := a.GetString("keys")
 		var repleat = false
 		var classify_index = -1
@@ -203,7 +203,7 @@ func (a *AfterPay) DirectSubKWS() error {
 		if len([]rune(keys)) > 20 {
 			keys = qutil.SubString(keys, 0, 20)
 		}
-		if ok && data != nil && len(*data) > 0 && keys != "" {
+		if data != nil && len(*data) > 0 && keys != "" {
 			o_vipjy, _ := (*data)["o_vipjy"].(map[string]interface{})
 			if o_vipjy["a_items"] != nil {
 				a_items := o_vipjy["a_items"].([]interface{})
@@ -243,7 +243,7 @@ func (a *AfterPay) DirectSubKWS() error {
 				_key["key"] = strings.Split(keys, " ")
 				a_key[0] = _key
 				if len(a_key) > 0 {
-					ok := util.MQFW.UpdateById("user", userId, bson.M{
+					ok := util.Compatible.Update(userId, bson.M{
 						"$push": bson.M{
 							"o_vipjy.a_items." + strconv.Itoa(classify_index) + ".a_key": bson.M{
 								"$each": a_key,
@@ -276,15 +276,15 @@ func (a *AfterPay) UpdateUserTips() error {
 	if userId != "" {
 		classify_index := a.GetString("classify_index")
 		kws_tips, _ := a.GetInteger("kws_tips")
-		data, ok := util.MQFW.FindById("user", userId, `{"o_vipjy.a_items":1}`)
-		if ok && data != nil && len(*data) > 0 {
+		data := util.Compatible.Select(userId, `{"o_vipjy.a_items":1}`)
+		if data != nil && len(*data) > 0 {
 			o_vipjy, _ := (*data)["o_vipjy"].(map[string]interface{})
 			a_items := o_vipjy["a_items"].([]interface{})
 			i, _ := strconv.Atoi(classify_index)
 			if i < len(a_items) {
 				saveData := make(map[string]interface{})
 				saveData["o_vipjy.a_items."+classify_index+".i_tips"] = kws_tips
-				flag = util.MQFW.UpdateById("user", userId, map[string]interface{}{
+				flag = util.Compatible.Update(userId, map[string]interface{}{
 					"$set": saveData,
 				})
 			}
@@ -420,12 +420,12 @@ func (a *AfterPay) SetUserInfo() error {
 			kwscount := a.GetString("kwscount")
 
 			//查询用vip关键词信息
-			data, ok := util.MQFW.FindById("user", userId, `{"o_vipjy.a_items":1}`)
-			if ok && data != nil && len(*data) > 0 {
+			data := util.Compatible.Select(userId, `{"o_vipjy.a_items":1}`)
+			if data != nil && len(*data) > 0 {
 				o_vipjy, _ := (*data)["o_vipjy"].(map[string]interface{})
 				a_items, errs := o_vipjy["a_items"].([]interface{})
 				if !errs {
-					util.MQFW.UpdateById("user", userId, map[string]interface{}{
+					util.Compatible.Update(userId, map[string]interface{}{
 						"$set": map[string]interface{}{
 							"o_vipjy.a_items": []map[string]interface{}{},
 						},
@@ -535,7 +535,7 @@ func (a *AfterPay) SetUserInfo() error {
 								msg = "关键词已存在"
 							} else {
 								if len(a_key) > 0 {
-									flag = util.MQFW.UpdateById("user", userId, bson.M{
+									flag = util.Compatible.Update(userId, bson.M{
 										"$push": bson.M{
 											"o_vipjy.a_items." + classify_index + ".a_key": bson.M{
 												"$each": a_key,
@@ -632,11 +632,11 @@ func (a *AfterPay) SetUserInfo() error {
 			saveData["o_vipjy.b_keytip"] = true //fasle:需要弹窗 true:不需要弹窗
 		}
 		if len(saveData) > 0 {
-			flag = util.MQFW.UpdateById("user", userId, map[string]interface{}{
+			flag = util.Compatible.Update(userId, map[string]interface{}{
 				"$set": saveData,
 			})
 		}
-		if data, ok := util.MQFW.FindById("user", userId, `{"o_vipjy":1}`); len(*data) > 0 && ok && data != nil {
+		if data := util.Compatible.Select(userId, `{"o_vipjy":1}`); len(*data) > 0 && data != nil {
 			(*data)["userid"] = userId
 			(*data)["type"] = "o_vipjy"
 			(*data)["createtime"] = time.Now().Unix()

+ 1 - 1
src/jfw/modules/weixin/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-20230209022443-283a80f1b7fa
 	github.com/SKatiyar/qr v0.0.0-20151201054752-25b6bdf44e67
 	go.mongodb.org/mongo-driver v1.11.1
 )