Browse Source

[微信第三方开发平台][修改]:状态修改

release_toaliyun_real
Stormeye Wu 7 years ago
parent
commit
10a40ec68b
5 changed files with 24 additions and 31 deletions
  1. +3
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxWeappAuditStatusServiceImpl.java
  2. +2
    -11
      mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java
  3. +6
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java
  4. +9
    -10
      mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java
  5. +4
    -0
      mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java

+ 3
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxWeappAuditStatusServiceImpl.java View File

@@ -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


+ 2
- 11
mallinkService/src/main/java/com/iformall/service/impl/WxWeappCodeStatusServiceImpl.java View File

@@ -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);
}


+ 6
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxWeappReleaseStatusServiceImpl.java View File

@@ -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());
}


+ 9
- 10
mallinkWechatOpen/src/main/java/com/iformall/controller/WechatWeappCodeController.java View File

@@ -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());
}
}


+ 4
- 0
mallinkWechatOpen/src/main/java/com/iformall/controller/WxWeappInfoController.java View File

@@ -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());


Loading…
Cancel
Save