Merge branch 'dev2.8.5' of http://192.168.3.207:10080/qmx/jy into dev2.8.5

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

@@ -408,11 +408,11 @@ func (a *AfterPay) GetUserInfo() error {
 					city_i += qutil.IntAll(cv.(int))
 				}
 			}
-			if area_i != -1 && city_i != 0 {
+			if area_i != -1 && area_i != 0 && city_i != 0 {
 				(*data)["o_area"] = strconv.Itoa(area_i) + "个省级区域、" + strconv.Itoa(city_i) + "个地市"
-			} else if area_i == -1 && city_i != 0 {
+			} else if (area_i == -1 || area_i != 0) && city_i != 0 {
 				(*data)["o_area"] = strconv.Itoa(city_i) + "个地市"
-			} else if area_i != -1 && city_i == 0 {
+			} else if area_i != -1 && area_i != 0 && city_i == 0 {
 				(*data)["o_area"] = strconv.Itoa(area_i) + "个省级区域"
 			} else {
 				(*data)["o_area"] = "全国"