Explorar o código

Merge branch 'dev/v4.9.19_dx' of qmx/jy into feature/v4.9.19

duxin hai 1 ano
pai
achega
88a0c6347c

+ 5 - 3
src/jfw/modules/bigmember/src/service/portrait/subvipPortraitAction.go

@@ -77,7 +77,7 @@ func (this *SubVipPortrait) SubVipWinnerNewMsg() {
 		if entId == "" {
 			return nil, fmt.Errorf("参数异常")
 		}
-		cepm, power, _, _ := entity.CreateSubVipPortraitManager(userId, "entNewMsg", entId, true, this.Session())
+		cepm, power, _, free := entity.CreateSubVipPortraitManager(userId, "entNewMsg", entId, true, this.Session())
 
 		pageNum, _ := this.GetInteger("pageNum")
 		pageSize, _ := this.GetInteger("pageSize")
@@ -86,7 +86,7 @@ func (this *SubVipPortrait) SubVipWinnerNewMsg() {
 			Screen: &entity.PortraitScreen{
 				Ent:        entId,
 				Match:      this.GetString("match"),
-				ExactMatch: this.GetString("matchType") == "1",
+				ExactMatch: this.GetString("exactMatch") == "1",
 				MatchRange: this.GetString("matchRange"),
 				Area:       this.GetString("area"),
 				ScopeClass: this.GetString("scopeClass"),
@@ -95,6 +95,7 @@ func (this *SubVipPortrait) SubVipWinnerNewMsg() {
 			},
 			PageNum:  pageNum,
 			PageSize: pageSize,
+			Free:     free,
 		})
 		if err != nil {
 			return nil, err
@@ -337,7 +338,7 @@ func (this *SubVipPortrait) BuyerNewMsg() {
 		}
 		pageNum, _ := this.GetInteger("pageNum")
 		pageSize, _ := this.GetInteger("pageSize")
-		cepm, power, err, _ := entity.CreateSubVipPortraitManagerForOpen(userId, "buyerNewMsg", buyer, false, this.Session())
+		cepm, power, err, free := entity.CreateSubVipPortraitManagerForOpen(userId, "buyerNewMsg", buyer, false, this.Session())
 		//if err != nil {
 		//	return nil, err
 		//}
@@ -356,6 +357,7 @@ func (this *SubVipPortrait) BuyerNewMsg() {
 			},
 			PageNum:  pageNum,
 			PageSize: pageSize,
+			Free:     free,
 		})
 		if err != nil {
 			return nil, err