提交

src/jfw/modules/subscribepay/src/config/config.go

@@ -1,7 +1,6 @@
 package config
 
 import (
-	"app.yhyue.com/moapp/jypkg/compatible"
 	"time"
 
 	"app.yhyue.com/moapp/jypkg/middleground"

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

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-20230208065001-1bb9895b1831 h1:5cvWBzlXrD0AsUhveS4UtERAhlRf2lPTDP+5Vyw9NlU=
-app.yhyue.com/moapp/jypkg v0.0.0-20230208065001-1bb9895b1831/go.mod h1:0DqPlGxaufZlKaLoRndTWG4j3qUQqJ6MNZCmoPcMqSg=
+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/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=

src/jfw/modules/subscribepay/src/service/bidfile.go

@@ -78,7 +78,7 @@ func EndMember(userid string) (bidfile_endtime string) {
 	bidfile_endtime = "2021年11月15日" //目前招标文件解读到11/15到期
 	bed := GetTime("2006年01月02日", bidfile_endtime)
 	data := util.Compatible.Select(userid, `{"i_member_endtime":1}`)
-	if data != nil && ok && len(*data) > 0 {
+	if data != nil && len(*data) > 0 {
 		endtime := qutil.Int64All((*data)["i_member_endtime"])
 		et := time.Unix(endtime, 0)
 		if bed.After(et) {

src/jfw/modules/subscribepay/src/service/commonAction.go

@@ -124,7 +124,7 @@ func (d *CommonAction) ApplyInvoice() error {
 	if product == "VIP订阅" {
 		//获取开发票时 用户所绑定的邮箱 user--s_myemail
 		d.GetSession("userId")
-		rdata := util.Compatible.Select(qutil.ObjToString(d.GetSession("userId")), `{"s_myemail":1}`)
+		email := util.Compatible.Select(qutil.ObjToString(d.GetSession("userId")), `{"s_myemail":1}`)
 		if len(*email) > 0 {
 			my_email = qutil.ObjToString((*email)["s_myemail"])
 		}

src/jfw/modules/subscribepay/src/service/userAccountInfo.go

@@ -145,22 +145,11 @@ func (this *UserAccount) Interested(doType string) {
 			if !(setValue == -1 || setValue == 1) {
 				return nil, PARAM_ERROR
 			}
-			updateOk := false
-			if positionType == 0 {
-				updateOk = util.MQFW.UpdateById("user", userId, map[string]interface{}{
-					"$set": map[string]interface{}{
-						"i_interested": setValue,
-					},
-				})
-			} else {
-				updateOk = util.MQFW.Update("ent_user", map[string]interface{}{
-					"i_userid": qutil.IntAll(sessVal["entUserId"]),
-				}, map[string]interface{}{
-					"$set": map[string]interface{}{
-						"i_interested": setValue,
-					},
-				}, false, false)
-			}
+			updateOk := util.Compatible.Update(userId, map[string]interface{}{
+				"$set": map[string]interface{}{
+					"i_interested": setValue,
+				},
+			})
 			if !updateOk {
 				return nil, DBUPDATE_ERROR
 			}

src/jfw/modules/subscribepay/src/timetask/timetask.go

@@ -510,7 +510,6 @@ func expireRemind() {
 			"l_vip_starttime":        1,
 			"l_vip_endtime":          1,
 			"i_vip_expire_tip":       1,
-						"i_vip_expire_tip_retry": 1,
 			"i_vip_expire_tip_retry": 1,
 		}
 		(&Personal{}).LoadVipUsers(field, doFunc)