Merge branch 'dev2.8.5' of ssh://192.168.3.207:10022/qmx/jy into dev2.8.5

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

@@ -233,15 +233,17 @@ func (this *RenewUpgrade) RenewUpgradeCreateOrder() {
 				if upgradeBuyset.AreaCount > newPCount || upgradeBuyset.AreaCount == -1 {
 					return &entity.FuncResult{false, errors.New("非法请求"), nil}
 				}
-				citysMap := upgradeBuyset.Citys
-				for a, b := range *newCityArr {
-					if (*cityArr)[a] != nil {
-						if qutil.IntAll((*cityArr)[a]) > qutil.IntAll(b) {
+				for province, cityCount := range *cityArr {
+					if (*newCityArr)[province] != nil {
+						if qutil.IntAll((*newCityArr)[province]) < qutil.IntAll(cityCount) {
 							return &entity.FuncResult{false, errors.New("非法请求"), nil}
 						}
 					}
-					if citysMap[a] != nil {
-						if qutil.IntAll(citysMap[a]) > qutil.IntAll(b) {
+				}
+				citysMap := upgradeBuyset.Citys
+				for provinces, cityCounts := range *newCityArr {
+					if citysMap[provinces] != nil {
+						if qutil.IntAll(citysMap[provinces]) > qutil.IntAll(cityCounts) {
 							return &entity.FuncResult{false, errors.New("非法请求"), nil}
 						}
 					}