| @@ -8,6 +8,7 @@ import com.iformall.common.ResultData; | |||||
| import com.iformall.domain.po.WxAuthorizerInfo; | import com.iformall.domain.po.WxAuthorizerInfo; | ||||
| import com.iformall.domain.po.WxWeappBasicSet; | import com.iformall.domain.po.WxWeappBasicSet; | ||||
| import com.iformall.domain.vo.WxWeappInfo; | import com.iformall.domain.vo.WxWeappInfo; | ||||
| import com.iformall.enums.EnumAppPlat; | |||||
| import com.iformall.enums.EnumAppType; | import com.iformall.enums.EnumAppType; | ||||
| import com.iformall.enums.EnumEnableType; | import com.iformall.enums.EnumEnableType; | ||||
| import com.iformall.enums.EnumWxAuthorizationStatus; | import com.iformall.enums.EnumWxAuthorizationStatus; | ||||
| @@ -113,7 +114,7 @@ public class WechatWeappSetController { | |||||
| if(authorizerInfo == null) { | if(authorizerInfo == null) { | ||||
| return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | ||||
| } | } | ||||
| if(!authorizerInfo.getAuthorizationStatus().equals(EnumWxAuthorizationStatus.AUTHORIZED.getCode())) { | |||||
| if(!EnumWxAuthorizationStatus.AUTHORIZED.getCode().equals(authorizerInfo.getAuthorizationStatus())) { | |||||
| return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | ||||
| } | } | ||||
| try { | try { | ||||
| @@ -192,7 +193,7 @@ public class WechatWeappSetController { | |||||
| if(authorizerInfo == null) { | if(authorizerInfo == null) { | ||||
| return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | ||||
| } | } | ||||
| if(!authorizerInfo.getAuthorizationStatus().equals(EnumWxAuthorizationStatus.AUTHORIZED.getCode())) { | |||||
| if(!EnumWxAuthorizationStatus.AUTHORIZED.getCode().equals(authorizerInfo.getAuthorizationStatus())) { | |||||
| return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | ||||
| } | } | ||||
| if(StringUtils.isBlank(wechatId)) { | if(StringUtils.isBlank(wechatId)) { | ||||
| @@ -258,10 +259,14 @@ public class WechatWeappSetController { | |||||
| if(authorizerInfo == null) { | if(authorizerInfo == null) { | ||||
| return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | ||||
| } | } | ||||
| if(!authorizerInfo.getAuthorizationStatus().equals(EnumWxAuthorizationStatus.AUTHORIZED.getCode())) { | |||||
| if(!EnumWxAuthorizationStatus.AUTHORIZED.getCode().equals(authorizerInfo.getAuthorizationStatus())) { | |||||
| return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | ||||
| } | } | ||||
| if(!EnumAppType.B.getCode().equals(authorizerInfo.getType()) && !EnumAppType.C.getCode().equals(authorizerInfo.getType())){ | |||||
| if(!EnumAppPlat.WX.getCode().equals(authorizerInfo.getPlat())){ | |||||
| return new ResultData(ErrorCode.WEAPP_BASIC_NO_SUPPORT); | |||||
| } | |||||
| if(!EnumAppType.B.getCode().equals(authorizerInfo.getType()) | |||||
| && !EnumAppType.C.getCode().equals(authorizerInfo.getType())){ | |||||
| return new ResultData(ErrorCode.WEAPP_BASIC_NO_SUPPORT); | return new ResultData(ErrorCode.WEAPP_BASIC_NO_SUPPORT); | ||||
| } | } | ||||
| @@ -302,10 +307,14 @@ public class WechatWeappSetController { | |||||
| if(authorizerInfo == null) { | if(authorizerInfo == null) { | ||||
| return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | ||||
| } | } | ||||
| if(!authorizerInfo.getAuthorizationStatus().equals(EnumWxAuthorizationStatus.AUTHORIZED.getCode())) { | |||||
| if(!EnumWxAuthorizationStatus.AUTHORIZED.getCode().equals(authorizerInfo.getAuthorizationStatus())) { | |||||
| return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | ||||
| } | } | ||||
| if(!EnumAppType.B.getCode().equals(authorizerInfo.getType()) && !EnumAppType.C.getCode().equals(authorizerInfo.getType())){ | |||||
| if(!EnumAppPlat.WX.getCode().equals(authorizerInfo.getPlat())){ | |||||
| return new ResultData(ErrorCode.WEAPP_BASIC_NO_SUPPORT); | |||||
| } | |||||
| if(!EnumAppType.B.getCode().equals(authorizerInfo.getType()) | |||||
| && !EnumAppType.C.getCode().equals(authorizerInfo.getType())){ | |||||
| return new ResultData(ErrorCode.WEAPP_BASIC_NO_SUPPORT); | return new ResultData(ErrorCode.WEAPP_BASIC_NO_SUPPORT); | ||||
| } | } | ||||
| try { | try { | ||||
| @@ -326,10 +335,14 @@ public class WechatWeappSetController { | |||||
| if(authorizerInfo == null) { | if(authorizerInfo == null) { | ||||
| return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | ||||
| } | } | ||||
| if(!authorizerInfo.getAuthorizationStatus().equals(EnumWxAuthorizationStatus.AUTHORIZED.getCode())) { | |||||
| if(!EnumWxAuthorizationStatus.AUTHORIZED.getCode().equals(authorizerInfo.getAuthorizationStatus())) { | |||||
| return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | ||||
| } | } | ||||
| if(!EnumAppType.B.getCode().equals(authorizerInfo.getType()) && !EnumAppType.C.getCode().equals(authorizerInfo.getType())){ | |||||
| if(!EnumAppPlat.WX.getCode().equals(authorizerInfo.getPlat())){ | |||||
| return new ResultData(ErrorCode.WEAPP_BASIC_NO_SUPPORT); | |||||
| } | |||||
| if(!EnumAppType.B.getCode().equals(authorizerInfo.getType()) | |||||
| && !EnumAppType.C.getCode().equals(authorizerInfo.getType())){ | |||||
| return new ResultData(ErrorCode.WEAPP_BASIC_NO_SUPPORT); | return new ResultData(ErrorCode.WEAPP_BASIC_NO_SUPPORT); | ||||
| } | } | ||||
| try { | try { | ||||
| @@ -368,10 +381,14 @@ public class WechatWeappSetController { | |||||
| if(authorizerInfo == null) { | if(authorizerInfo == null) { | ||||
| return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | ||||
| } | } | ||||
| if(!authorizerInfo.getAuthorizationStatus().equals(EnumWxAuthorizationStatus.AUTHORIZED.getCode())) { | |||||
| if(!EnumWxAuthorizationStatus.AUTHORIZED.getCode().equals(authorizerInfo.getAuthorizationStatus())) { | |||||
| return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | return new ResultData(ErrorCode.WEAPP_APPID_NOT_AUTH); | ||||
| } | } | ||||
| if(!EnumAppType.B.getCode().equals(authorizerInfo.getType()) && !EnumAppType.C.getCode().equals(authorizerInfo.getType())){ | |||||
| if(!EnumAppPlat.WX.getCode().equals(authorizerInfo.getPlat())){ | |||||
| return new ResultData(ErrorCode.WEAPP_BASIC_NO_SUPPORT); | |||||
| } | |||||
| if(!EnumAppType.B.getCode().equals(authorizerInfo.getType()) | |||||
| && !EnumAppType.C.getCode().equals(authorizerInfo.getType())){ | |||||
| return new ResultData(ErrorCode.WEAPP_BASIC_NO_SUPPORT); | return new ResultData(ErrorCode.WEAPP_BASIC_NO_SUPPORT); | ||||
| } | } | ||||
| @@ -428,11 +445,16 @@ public class WechatWeappSetController { | |||||
| logger.error(info.getName()+"("+appId+")申请("+apiName+")失败{}"+ErrorCode.WEAPP_APPID_NOT_AUTH.getMessage()); | logger.error(info.getName()+"("+appId+")申请("+apiName+")失败{}"+ErrorCode.WEAPP_APPID_NOT_AUTH.getMessage()); | ||||
| continue; | continue; | ||||
| } | } | ||||
| if(!authorizerInfo.getAuthorizationStatus().equals(EnumWxAuthorizationStatus.AUTHORIZED.getCode())) { | |||||
| if(!EnumWxAuthorizationStatus.AUTHORIZED.getCode().equals(authorizerInfo.getAuthorizationStatus())) { | |||||
| logger.error(info.getName()+"("+appId+")申请("+apiName+")失败{}"+ErrorCode.WEAPP_APPID_NOT_AUTH.getMessage()); | logger.error(info.getName()+"("+appId+")申请("+apiName+")失败{}"+ErrorCode.WEAPP_APPID_NOT_AUTH.getMessage()); | ||||
| continue; | continue; | ||||
| } | } | ||||
| if(!EnumAppType.B.getCode().equals(authorizerInfo.getType()) && !EnumAppType.C.getCode().equals(authorizerInfo.getType())){ | |||||
| if(!EnumAppPlat.WX.getCode().equals(authorizerInfo.getPlat())){ | |||||
| logger.error(info.getName()+"("+appId+")申请("+apiName+")失败{}"+ErrorCode.WEAPP_BASIC_NO_SUPPORT.getMessage()); | |||||
| continue; | |||||
| } | |||||
| if(!EnumAppType.B.getCode().equals(authorizerInfo.getType()) | |||||
| && !EnumAppType.C.getCode().equals(authorizerInfo.getType())){ | |||||
| logger.error(info.getName()+"("+appId+")申请("+apiName+")失败{}"+ErrorCode.WEAPP_BASIC_NO_SUPPORT.getMessage()); | logger.error(info.getName()+"("+appId+")申请("+apiName+")失败{}"+ErrorCode.WEAPP_BASIC_NO_SUPPORT.getMessage()); | ||||
| continue; | continue; | ||||
| } | } | ||||