From 81930a75650e3b5d80add376492988f890b024fc Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Wed, 6 Mar 2019 17:31:04 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=BC=80=E6=94=BE=E5=B9=B3=E5=8F=B0][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=8F=91=E5=B8=83=E5=AD=98=E5=BA=93?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WechatWeappCodeController.java | 14 ++++++++++++-- .../iformall/controller/WxWeappInfoController.java | 14 ++++++++++++-- 2 files changed, 24 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 22b78775e..d6613714a 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java @@ -380,6 +380,7 @@ public class WechatWeappCodeController { Gson gson = new GsonBuilder().create(); WxWeappAuditStatus auditStatus = weappAuditStatusService.getByAppId(appId); if(auditStatus.getAuditStatus().equals(EnumWeappAuditStatus.SUCCESS.getCode())) { + boolean isUpdate = false; WxWeappReleaseStatus releaseStatus = weappReleaseStatusService.getByAppId(appId); if(releaseStatus != null) { // 版本已发布成功,跳过 @@ -395,6 +396,7 @@ public class WechatWeappCodeController { releaseStatus.setType(auditStatus.getType()); releaseStatus.setUserVersion(auditStatus.getUserVersion()); releaseStatus.setVersionDesc(auditStatus.getVersionDesc()); + isUpdate = true; } try { WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); @@ -407,14 +409,22 @@ public class WechatWeappCodeController { } releaseStatus.setReleaseErrCode(gson.toJson(openRet)); releaseStatus.setReleaseTime(new Date()); - weappReleaseStatusService.saveStatus(releaseStatus); + if(isUpdate) { + weappReleaseStatusService.updateStatus(releaseStatus); + } else { + weappReleaseStatusService.saveStatus(releaseStatus); + } return new ResultData(openRet); } catch (WxErrorException e) { logger.error(e.getMessage()); releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); releaseStatus.setReleaseErrCode(e.getMessage()); releaseStatus.setReleaseTime(new Date()); - weappReleaseStatusService.updateStatus(releaseStatus); + if(isUpdate) { + weappReleaseStatusService.updateStatus(releaseStatus); + } else { + weappReleaseStatusService.saveStatus(releaseStatus); + } return new ResultData(Result.ERROR, e.getMessage()); } } else { diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index 90655b888..5f7b2af11 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -750,6 +750,7 @@ public class WxWeappInfoController extends BaseController { queryVo.setAuditStatus(EnumWeappAuditStatus.SUCCESS.getCode()); List apps = weappAuditStatusService.getList(queryVo); apps.stream().forEach( auditStatus -> { + boolean isUpdate = false; WxWeappReleaseStatus releaseStatus = weappReleaseStatusService.getByAppId(auditStatus.getAppId()); if(releaseStatus != null) { // 当前版本已发布成功,跳过 @@ -766,6 +767,7 @@ public class WxWeappInfoController extends BaseController { releaseStatus.setType(auditStatus.getType()); releaseStatus.setUserVersion(auditStatus.getUserVersion()); releaseStatus.setVersionDesc(auditStatus.getVersionDesc()); + isUpdate = true; } try { @@ -784,13 +786,21 @@ public class WxWeappInfoController extends BaseController { } releaseStatus.setReleaseErrCode(gson.toJson(openRet)); releaseStatus.setReleaseTime(new Date()); - weappReleaseStatusService.saveStatus(releaseStatus); + if(isUpdate) { + weappReleaseStatusService.updateStatus(releaseStatus); + } else { + weappReleaseStatusService.saveStatus(releaseStatus); + } } catch (WxErrorException e) { logger.error(e.getMessage()); releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); releaseStatus.setReleaseErrCode(e.getMessage()); releaseStatus.setReleaseTime(new Date()); - weappReleaseStatusService.updateStatus(releaseStatus); + if(isUpdate) { + weappReleaseStatusService.updateStatus(releaseStatus); + } else { + weappReleaseStatusService.saveStatus(releaseStatus); + } } }); return new ResultData();