wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/REQ-1507' into dev

Browse Source
This commit is contained in:
陈维伟 2023-11-10 15:16:20 +08:00
commit 827086a789
4 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
inside-notices/src/main/java/cn/axzo/msg/center/message/controller/PendingMessageNewController.java
View File

@ -65,12 +65,12 @@ public class PendingMessageNewController implements PendingMessageClient {
}
@Override
public CommonResponse<Boolean> complete(String msgIdentityCode) {
return CommonResponse.success(pendingMessageNewService.complete(msgIdentityCode));
public CommonResponse<Boolean> complete(String requestNo) {
return CommonResponse.success(pendingMessageNewService.complete(requestNo));
}
@Override
public CommonResponse<Boolean> revoke(String msgIdentityCode) {
return CommonResponse.success(pendingMessageNewService.revoke(msgIdentityCode));
public CommonResponse<Boolean> revoke(String requestNo) {
return CommonResponse.success(pendingMessageNewService.revoke(requestNo));
}
}

8
inside-notices/src/main/java/cn/axzo/msg/center/message/service/PendingMessageNewService.java
View File

@ -51,16 +51,16 @@ public interface PendingMessageNewService {
/**
* 完成代办
*
* @param msgIdentityCode 代办唯一标识
* @param requestNo 代办唯一标识
* @return 成功返回 {@code true} 失败返回 {@code false}
*/
Boolean complete(String msgIdentityCode);
Boolean complete(String requestNo);
/**
* 撤销代办
*
* @param msgIdentityCode 代办唯一标识
* @param requestNo 代办唯一标识
* @return 成功返回 {@code true} 失败返回 {@code false}
*/
Boolean revoke(String msgIdentityCode);
Boolean revoke(String requestNo);
}

20
inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/PendingMessageNewServiceImpl.java
View File

@ -130,30 +130,30 @@ public class PendingMessageNewServiceImpl implements PendingMessageNewService {
}
@Override
public Boolean complete(String msgIdentityCode) {
if (StringUtils.isBlank(msgIdentityCode)) {
log.warn("the message identity code is blank.");
public Boolean complete(String requestNo) {
if (StringUtils.isBlank(requestNo)) {
log.warn("the message requestNo is blank.");
return false;
}
log.info("the [{}] record is updated complete.", msgIdentityCode);
log.info("the [{}] record is updated complete.", requestNo);
return pendingMessageRecordDao.lambdaUpdate()
.set(PendingMessageRecord::getState, PendingMessageStateEnum.COMPLETED)
.eq(PendingMessageRecord::getIdentityCode, msgIdentityCode)
.eq(PendingMessageRecord::getRequestNo, requestNo)
.eq(PendingMessageRecord::getState, PendingMessageStateEnum.HAS_BEEN_SENT)
.eq(PendingMessageRecord::getIsDelete, TableIsDeleteEnum.NORMAL.value)
.update();
}
@Override
public Boolean revoke(String msgIdentityCode) {
if (StringUtils.isBlank(msgIdentityCode)) {
log.warn("the message identity code is blank.");
public Boolean revoke(String requestNo) {
if (StringUtils.isBlank(requestNo)) {
log.warn("the message requestNo is blank.");
return false;
}
log.info("the [{}] record is updated retract.", msgIdentityCode);
log.info("the [{}] record is updated retract.", requestNo);
return pendingMessageRecordDao.lambdaUpdate()
.set(PendingMessageRecord::getState, PendingMessageStateEnum.RETRACT)
.eq(PendingMessageRecord::getIdentityCode, msgIdentityCode)
.eq(PendingMessageRecord::getRequestNo, requestNo)
.eq(PendingMessageRecord::getState, PendingMessageStateEnum.HAS_BEEN_SENT)
.eq(PendingMessageRecord::getIsDelete, TableIsDeleteEnum.NORMAL.value)
.update();

8
msg-center-api/src/main/java/cn/axzo/msg/center/service/pending/client/PendingMessageClient.java
View File

@ -68,18 +68,18 @@ public interface PendingMessageClient {
/**
* 完成代办
*
* @param msgIdentityCode 代办唯一标识
* @param requestNo 代办唯一标识
* @return 成功返回 {@code true} 失败返回 {@code false}
*/
@PostMapping(value = "/pending-message/complete", produces = {MediaType.APPLICATION_JSON_VALUE})
CommonResponse<Boolean> complete(@RequestParam("msgIdentityCode") String msgIdentityCode);
CommonResponse<Boolean> complete(@RequestParam("requestNo") String requestNo);
/**
* 撤销代办
*
* @param msgIdentityCode 代办唯一标识
* @param requestNo 代办唯一标识
* @return 成功返回 {@code true} 失败返回 {@code false}
*/
@PostMapping(value = "/pending-message/revoke", produces = {MediaType.APPLICATION_JSON_VALUE})
CommonResponse<Boolean> revoke(@RequestParam("msgIdentityCode") String msgIdentityCode);
CommonResponse<Boolean> revoke(@RequestParam("requestNo") String requestNo);
}