wip:提交

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

@@ -58,7 +58,6 @@ func freeSet(area, district map[string]interface{}, industry []string, userId st
 	} else if len(area) == 0 {
 		return &FuncResult{false, errors.New("地区参数异常"), nil}
 	}
-	fmt.Println(userId, ":", isfirst, ppb, areacount)
 	//免费用户未购买省份订阅包 按年算
 	year := fmt.Sprint(time.Now().Year())
 	//免费用户 已调整地区次数
@@ -71,10 +70,16 @@ func freeSet(area, district map[string]interface{}, industry []string, userId st
 		if areacount+jy.BaseAreaNum < len(area) {
 			return &FuncResult{false, errors.New("超出地区可设置范围"), nil}
 		}
-		fmt.Println(userId, "ccccc:", areacount, jy.BaseAreaNum, ppnum, areacount+jy.BaseAreaNum <= ppnum)
-		//地区调整次数判断
-		if areacount+jy.BaseAreaNum <= ppnum { //+fpnum
-			return &FuncResult{false, errors.New(fmt.Sprintf("订阅地区调整次数（%d）已用完", areacount+jy.BaseAreaNum)), 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}
+			}
 		}
 	}
 	//清楚缓存