From 53bda15e4880ad01fbac522714cd5ca9ec78a5e6 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Sat, 2 Mar 2019 15:45:08 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E7=99=BB=E5=BD=95][=E4=BF=AE=E6=94=B9]:code=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E7=94=A8=E6=88=B7=E6=8F=90=E4=BA=A4version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WechatWeappCodeController.java | 12 ++++++---- .../controller/WxWeappInfoController.java | 23 +++++++++++++++++++ 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java index cf237308f..7dd312af8 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java @@ -10,10 +10,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxAppinfo; import com.iformall.domain.po.WxAuthorizerInfo; import com.iformall.domain.po.WxWeappCodeStatus; -import com.iformall.enums.EnumWeappAuditStatus; -import com.iformall.enums.EnumWeappCodeCommitStatus; -import com.iformall.enums.EnumWeappReleaseStatus; -import com.iformall.enums.EnumWxAuthorizationStatus; +import com.iformall.enums.*; import com.iformall.service.WxAppinfoService; import com.iformall.service.WxAuthorizerInfoService; import com.iformall.service.WxWeappCodeStatusService; @@ -81,6 +78,13 @@ public class WechatWeappCodeController { WxAppinfo appinfo = appinfoService.getByAppId(appId); + int iAppType = 0; + String appTypeStr = userVersion.substring(0, 1); + if(appTypeStr.equalsIgnoreCase("C")) + iAppType = EnumAppType.C.getCode(); + else if(appTypeStr.equalsIgnoreCase("B")) + iAppType = EnumAppType.B.getCode(); + try { // code提交 WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index 852955707..c68f4066b 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -354,6 +354,17 @@ public class WxWeappInfoController extends BaseController { private void codeOperation(String appId, String userVersion, String userDesc, Long templateId) { WxAppinfo appinfo = appinfoService.getByAppId(appId); + int iAppType = 0; + String appTypeStr = userVersion.substring(0, 1); + if(appTypeStr.equalsIgnoreCase("C")) + iAppType = EnumAppType.C.getCode(); + else if(appTypeStr.equalsIgnoreCase("B")) + iAppType = EnumAppType.B.getCode(); + if(!appinfo.getType().equals(iAppType)) { + // 如果版本号与小程序的类型不一致,不提交版本 + return; + } + // get ext json WxWeappExtSet extSetQ = new WxWeappExtSet(); extSetQ.setAppId(appId); @@ -424,6 +435,18 @@ public class WxWeappInfoController extends BaseController { private void codeCommit(String appId, String userVersion, String userDesc, Long templateId) { WxAppinfo appinfo = appinfoService.getByAppId(appId); + int iAppType = 0; + String appTypeStr = userVersion.substring(0, 1); + if(appTypeStr.equalsIgnoreCase("C")) + iAppType = EnumAppType.C.getCode(); + else if(appTypeStr.equalsIgnoreCase("B")) + iAppType = EnumAppType.B.getCode(); + + if(!appinfo.getType().equals(iAppType)) { + // 如果版本号与小程序的类型不一致,不提交版本 + return; + } + // get ext json WxWeappExtSet extSetQ = new WxWeappExtSet(); extSetQ.setAppId(appId);