WH01243 4 жил өмнө
parent
commit
14b33ac1a1

+ 4 - 4
src/jfw/modules/distribution/src/service/action/partner.go

@@ -51,12 +51,12 @@ func (p *Partner) SendMessage() {
 
 
 //加入伙伴
 //加入伙伴
 func (p *Partner) AddPartner() {
 func (p *Partner) AddPartner() {
-	/*if !R.CheckReqParam(p.ResponseWriter, p.Request, "phone", "email", "type", "channel","contacts") {
+	if !R.CheckReqParam(p.ResponseWriter, p.Request, "phone", "email", "type", "channel","contacts") {
 		return
 		return
-	}*/
+	}
 	status, msg := func() (int, string) {
 	status, msg := func() (int, string) {
-		//userid := qu.ObjToString(p.GetSession("userId"))
-		userid := "5f3391b8e138236a19cc2f67"
+		userid := qu.ObjToString(p.GetSession("userId"))
+		//userid := "5f3391b8e138236a19cc2f67"
 		if userid == "" {
 		if userid == "" {
 			return -1, "未登录"
 			return -1, "未登录"
 		}
 		}

+ 4 - 2
src/jfw/modules/distribution/src/service/filter/filter.go

@@ -1,6 +1,8 @@
 package filter
 package filter
 
 
+import "github.com/go-xweb/xweb"
+
 func init() {
 func init() {
-/*	xweb.AddFilter(&logfilter{App: xweb.RootApp()})
-	xweb.AddFilter(&sessionfilter{App: xweb.RootApp()})*/
+	xweb.AddFilter(&logfilter{App: xweb.RootApp()})
+	xweb.AddFilter(&sessionfilter{App: xweb.RootApp()})
 }
 }

+ 2 - 3
src/jfw/modules/subscribepay/src/entity/distribution.go

@@ -8,7 +8,6 @@ import (
 	"pay"
 	"pay"
 	qutil "qfw/util"
 	qutil "qfw/util"
 	"qfw/util/redis"
 	"qfw/util/redis"
-	"strconv"
 	"strings"
 	"strings"
 	"time"
 	"time"
 	"util"
 	"util"
@@ -73,7 +72,7 @@ func DisWordRecode(order_id, sale_money int, product_name, disWord string) {
 func OtherDisWordRecode(order_id, sale_money int, product_name, disWord, userId, creatTime string) {
 func OtherDisWordRecode(order_id, sale_money int, product_name, disWord, userId, creatTime string) {
 	//redis 获取分销者信息
 	//redis 获取分销者信息
 	//查询用户是企业还是个人账户
 	//查询用户是企业还是个人账户
-	parentList := util.Mysql.SelectBySql("select  * from  dis_partner where uid=? ", userId)
+	/*parentList := util.Mysql.SelectBySql("select  * from  dis_partner where uid=? ", userId)
 	parentType := 1
 	parentType := 1
 	if len(*parentList) > 0 {
 	if len(*parentList) > 0 {
 		parentTypeInt, _ := strconv.Atoi(fmt.Sprint((*parentList)[0]["type"]))
 		parentTypeInt, _ := strconv.Atoi(fmt.Sprint((*parentList)[0]["type"]))
@@ -81,7 +80,7 @@ func OtherDisWordRecode(order_id, sale_money int, product_name, disWord, userId,
 	}
 	}
 	if (parentType == 2) {
 	if (parentType == 2) {
 		return
 		return
-	}
+	}*/
 	infoList := util.Mysql.SelectBySql("select  * from  dis_word where userId=? and  password =? ", userId, disWord)
 	infoList := util.Mysql.SelectBySql("select  * from  dis_word where userId=? and  password =? ", userId, disWord)
 	if len(*infoList) != 0 {
 	if len(*infoList) != 0 {
 		//分销者id
 		//分销者id

+ 0 - 1
src/jfw/modules/weixin/src/wx/wx.go

@@ -644,7 +644,6 @@ func CheckQmxUser(newUser *map[string]interface{}, UnionId string) (b bool, qmxi
 var loginWxPool = make(chan bool, 1)
 var loginWxPool = make(chan bool, 1)
 
 
 func Subscribe(w ResponseWriter, r *Request) {
 func Subscribe(w ResponseWriter, r *Request) {
-	fmt.Println(r)
 	defer util.Catch()
 	defer util.Catch()
 	openid := r.FromUserName
 	openid := r.FromUserName
 	if isRepeatCall(openid, r.CreateTime) {
 	if isRepeatCall(openid, r.CreateTime) {