From 10a40ec68b2dda21239a401155dba71dc147c566 Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Mon, 4 Mar 2019 23:01:18 +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=E5=8F=91=E5=B9=B3=E5=8F=B0][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/WxWeappAuditStatusServiceImpl.java | 9 +++------ .../impl/WxWeappCodeStatusServiceImpl.java | 13 ++----------- .../impl/WxWeappReleaseStatusServiceImpl.java | 10 ++++++---- .../controller/WechatWeappCodeController.java | 19 +++++++++---------- .../controller/WxWeappInfoController.java | 4 ++++ 5 files changed, 24 insertions(+), 31 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappAuditStatusServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappAuditStatusServiceImpl.java index 95e37332d..4698d725d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappAuditStatusServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappAuditStatusServiceImpl.java @@ -52,17 +52,14 @@ public class WxWeappAuditStatusServiceImpl implements WxWeappAuditStatusService @Override public void saveStatus(WxWeappAuditStatus record) { + logger.info("AUDIT: " + record.toString()); weappAuditStatusMapper.insertSelective(record); } @Override public void updateStatus(WxWeappAuditStatus record) { - WxWeappAuditStatus updateRecord = new WxWeappAuditStatus(); - updateRecord.setId(record.getId()); - updateRecord.setAuditStatus(record.getAuditStatus()); - updateRecord.setAuditErrCode(record.getAuditErrCode()); - updateRecord.setAuditTime(record.getAuditTime()); - weappAuditStatusMapper.updateByPrimaryKeySelective(updateRecord); + logger.info("AUDIT: " + record.toString()); + weappAuditStatusMapper.updateByPrimaryKeySelective(record); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java index 25cb1fdf5..ae95ca7c0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java @@ -54,21 +54,12 @@ public class WxWeappCodeStatusServiceImpl implements WxWeappCodeStatusService { @Override public void saveStatus(WxWeappCodeStatus record) { - Date curDate = new Date(); - if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); - weappCodeStatusMapper.insertSelective(record); - } else { - logger.info("CODE-COMMIT: " + record.toString()); - weappCodeStatusMapper.updateStatus(record); - } + logger.info("CODE-COMMIT: " + record.toString()); + weappCodeStatusMapper.insertSelective(record); } @Override public void updateStatus(WxWeappCodeStatus record) { - Date curDate = new Date(); logger.info("CODE-COMMIT: " + record.toString()); weappCodeStatusMapper.updateStatus(record); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java index 60c4c6e02..a004a1fda 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java @@ -58,6 +58,7 @@ public class WxWeappReleaseStatusServiceImpl implements WxWeappReleaseStatusServ @Override public void saveStatus(WxWeappReleaseStatus record) { + logger.info("RELEASE: " + record.toString()); weappReleaseStatusMapper.insertSelective(record); } @@ -81,10 +82,11 @@ public class WxWeappReleaseStatusServiceImpl implements WxWeappReleaseStatusServ WxAuthorizerInfo appQ = new WxAuthorizerInfo(); appQ.setAuthorizerAppid(record.getAppId()); WxAuthorizerInfo authorizerInfo = authorizerInfoMapper.selectOne(appQ); - record.setUserVersion(authorizerInfo.getCurrentVersion()); - record.setVersionDesc(authorizerInfo.getCurrentDesc()); - record.setReleaseTime(authorizerInfo.getReleaseTime()); - return; + if(authorizerInfo != null) { + record.setUserVersion(authorizerInfo.getCurrentVersion()); + record.setVersionDesc(authorizerInfo.getCurrentDesc()); + record.setReleaseTime(authorizerInfo.getReleaseTime()); + } } catch (Exception e) { logger.error(e.getMessage()); } diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java index 2b6370a51..1bf356917 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java @@ -305,7 +305,6 @@ public class WechatWeappCodeController { break; case 1: auditStatus.setAuditStatus(EnumWeappAuditStatus.FAIL.getCode()); - auditStatus.setAuditErrCode(gson.toJson(openRet)); break; case 2: auditStatus.setAuditStatus(EnumWeappAuditStatus.AUDITING.getCode()); @@ -317,6 +316,7 @@ public class WechatWeappCodeController { auditStatus.setAuditStatus(EnumWeappAuditStatus.AUDITING.getCode()); break; } + auditStatus.setAuditErrCode(gson.toJson(openRet)); auditStatus.setAuditTime(new Date()); weappAuditStatusService.updateStatus(auditStatus); } @@ -349,7 +349,6 @@ public class WechatWeappCodeController { break; case 1: auditStatus.setAuditStatus(EnumWeappAuditStatus.FAIL.getCode()); - auditStatus.setAuditErrCode(gson.toJson(openRet)); break; case 2: auditStatus.setAuditStatus(EnumWeappAuditStatus.AUDITING.getCode()); @@ -361,6 +360,7 @@ public class WechatWeappCodeController { auditStatus.setAuditStatus(EnumWeappAuditStatus.AUDITING.getCode()); break; } + auditStatus.setAuditErrCode(gson.toJson(openRet)); auditStatus.setAuditTime(new Date()); weappAuditStatusService.updateStatus(auditStatus); } @@ -387,6 +387,8 @@ public class WechatWeappCodeController { && releaseStatus.getReleaseStatus().equals(EnumWeappReleaseStatus.SUCCESS.getCode())) { return new ResultData(ErrorCode.WEAPP_APP_RELEASEED); } + releaseStatus.setUserVersion(auditStatus.getUserVersion()); + releaseStatus.setVersionDesc(auditStatus.getVersionDesc()); } else { releaseStatus = new WxWeappReleaseStatus(); releaseStatus.setAppId(auditStatus.getAppId()); @@ -400,18 +402,18 @@ public class WechatWeappCodeController { logger.info(openRet.toString()); if(openRet.getErrcode().equals('0')) { releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.SUCCESS.getCode()); - releaseStatus.setReleaseTime(new Date()); } else { releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); - releaseStatus.setReleaseErrCode(gson.toJson(openRet)); - releaseStatus.setReleaseTime(new Date()); } + releaseStatus.setReleaseErrCode(gson.toJson(openRet)); + releaseStatus.setReleaseTime(new Date()); 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); return new ResultData(Result.ERROR, e.getMessage()); } @@ -423,6 +425,7 @@ public class WechatWeappCodeController { @ApiOperation("小程序版本回退") @GetMapping("/revertCodeRelease") public ResultData revertCodeRelease(String appId) { + Gson gson = new GsonBuilder().create(); WxWeappReleaseStatus releaseStatus = weappReleaseStatusService.getByAppId(appId); try { WxOpenMaService openMaService = openService.getWxOpenComponentService().getWxMaServiceByAppid(appId); @@ -431,6 +434,7 @@ public class WechatWeappCodeController { if(openRet.isSuccess()) { if(releaseStatus != null) { releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.BACK.getCode()); + releaseStatus.setReleaseErrCode(gson.toJson(openRet)); releaseStatus.setReleaseTime(new Date()); weappReleaseStatusService.updateStatus(releaseStatus); } @@ -439,11 +443,6 @@ public class WechatWeappCodeController { return new ResultData(openRet); } catch (WxErrorException e) { logger.error(e.getMessage()); - if(releaseStatus != null) { - releaseStatus.setReleaseStatus(EnumWeappReleaseStatus.FAIL.getCode()); - releaseStatus.setReleaseErrCode(e.getMessage()); - weappReleaseStatusService.updateStatus(releaseStatus); - } return new ResultData(Result.ERROR, e.getMessage()); } } diff --git a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java index 07c216062..cbedd1004 100644 --- a/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java +++ b/mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java @@ -481,6 +481,7 @@ public class WxWeappInfoController extends BaseController { if (codeStatus == null) { codeStatus = new WxWeappCodeStatus(); + codeStatus.setId(appinfo.getId()); codeStatus.setAppId(appinfo.getAppId()); if (appinfo != null) { codeStatus.setType(appinfo.getType()); @@ -671,8 +672,11 @@ public class WxWeappInfoController extends BaseController { && releaseStatus.getReleaseStatus().equals(EnumWeappReleaseStatus.SUCCESS.getCode())) { return; } + releaseStatus.setUserVersion(auditStatus.getUserVersion()); + releaseStatus.setVersionDesc(auditStatus.getVersionDesc()); } else { releaseStatus = new WxWeappReleaseStatus(); + releaseStatus.setId(auditStatus.getId()); releaseStatus.setAppId(auditStatus.getAppId()); releaseStatus.setType(auditStatus.getType()); releaseStatus.setUserVersion(auditStatus.getUserVersion());