wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-3982: fix bugs

Browse Source
This commit is contained in:
yanglin 2025-04-27 18:27:27 +08:00
parent 6530b22249
commit d589427248
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/domain/ChangeRecord.java
View File

@ -1,5 +1,6 @@
package cn.axzo.nanopart.visa.server.domain;
import cn.axzo.nanopart.visa.api.enums.VisaProcessPhase;
import cn.axzo.nanopart.visa.api.enums.VisaStampStatusEnum;
import cn.axzo.nanopart.visa.api.enums.VisaStatusEnum;
import cn.axzo.nanopart.visa.api.enums.VisaTypeEnum;
@ -21,6 +22,7 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.Accessors;
import javax.validation.constraints.NotNull;
import java.math.BigDecimal;
import java.util.Date;
import java.util.Optional;
@ -234,7 +236,8 @@ public class ChangeRecord extends BaseEntity<ChangeRecord> {
VISA_STAMP_STATUS_ACTION.put(VisaStampStatusEnum.WITH_PRINT, UpdateVisaChangeReq.VisaStampAction.AUTO_COMPLETE, VisaStampStatusEnum.USED_PRINTS);
}
public VisaStampStatusEnum nextStampStatus(UpdateVisaChangeReq.VisaStampAction action) {
return Optional.ofNullable(VISA_STAMP_STATUS_ACTION.get(this.getStampStatus(), action)).orElseThrow(BizResultCode.VISA_STAMP_STATUS_ERROR::toException);
public VisaStampStatusEnum nextStampStatus(UpdateVisaChangeReq.VisaStampAction action, VisaProcessPhase phase) {
VisaStampStatusEnum stampStatus = phase == VisaProcessPhase.PROJECT ? this.getStampStatus() : this.getStampStatusPay();
return Optional.ofNullable(VISA_STAMP_STATUS_ACTION.get(stampStatus, action)).orElseThrow(BizResultCode.VISA_STAMP_STATUS_ERROR::toException);
}
}

2
visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordServiceImpl.java
View File

@ -1999,7 +1999,7 @@ public class ChangeRecordServiceImpl extends ServiceImpl<ChangeRecordDao, Change
result.setId(req.getVisaId());
if (Objects.nonNull(req.getVisaStampAction())) {
VisaStampStatusEnum nextStampStatus = oldValue.nextStampStatus(req.getVisaStampAction());
VisaStampStatusEnum nextStampStatus = oldValue.nextStampStatus(req.getVisaStampAction(), req.getPhase());
if (req.getPhase() == VisaProcessPhase.PROJECT)
result.setStampStatus(nextStampStatus);
else