wip:提交

src/jfw/modules/publicapply/src/subscribePush/entity/setting.go

@@ -70,16 +70,9 @@ func freeSet(area, district map[string]interface{}, industry []string, userId st
 		if areacount+jy.BaseAreaNum < len(area) {
 			return &FuncResult{false, errors.New("超出地区可设置范围"), nil}
 		}
-		if ppb {
-			//地区调整次数判断
-			if areacount+jy.BaseAreaNum <= ppnum { //+fpnum
-				return &FuncResult{false, errors.New(fmt.Sprintf("订阅地区调整次数（%d）已用完", areacount+jy.BaseAreaNum)), nil}
-			}
-		} else {
-			//地区调整次数判断
-			if areacount+jy.BaseAreaNum <= fpnum { //+fpnum
-				return &FuncResult{false, errors.New(fmt.Sprintf("订阅地区调整次数（%d）已用完", areacount+jy.BaseAreaNum)), nil}
-			}
+		//地区调整次数判断
+		if areacount+jy.BaseAreaNum <= ppnum+fpnum {
+			return &FuncResult{false, fmt.Errorf("订阅地区调整次数已用完"), nil}
 		}
 	}
 	//清楚缓存