提交 a0ba91cb authored 作者: liruixin's avatar liruixin

违约结算单枚举

上级 03b95383
...@@ -13,7 +13,7 @@ public enum BreakContractSettlementOwnerEnum { ...@@ -13,7 +13,7 @@ public enum BreakContractSettlementOwnerEnum {
@Getter @Getter
@AllArgsConstructor @AllArgsConstructor
public enum Status { public enum Status {
TO_BE_LOCKED(10, "待对账"), TO_BE_ACCOUNT(10, "待对账"),
OWNER_TO_BE_CONFIRMED(20, "待货主确认"), OWNER_TO_BE_CONFIRMED(20, "待货主确认"),
SHIPPER_TO_PAYMENT (30, "待货主付款"), SHIPPER_TO_PAYMENT (30, "待货主付款"),
PLATFORM_CONFIRMED_OWNER_PAYMENT(40, "待平台确认付款"), PLATFORM_CONFIRMED_OWNER_PAYMENT(40, "待平台确认付款"),
......
...@@ -43,7 +43,7 @@ public class BreakContractSettlementOwnerDaoImpl extends BaseDaoImpl<BreakContra ...@@ -43,7 +43,7 @@ public class BreakContractSettlementOwnerDaoImpl extends BaseDaoImpl<BreakContra
public boolean uploadInvoiceImg(Integer id, String invoiceImg) { public boolean uploadInvoiceImg(Integer id, String invoiceImg) {
return update(lUdWrapper() return update(lUdWrapper()
.eq(BreakContractSettlementOwner::getId, id) .eq(BreakContractSettlementOwner::getId, id)
.eq(BreakContractSettlementOwner::getStatus, BreakContractSettlementOwnerEnum.Status.TO_BE_LOCKED.getCode()) .eq(BreakContractSettlementOwner::getStatus, BreakContractSettlementOwnerEnum.Status.TO_BE_ACCOUNT.getCode())
.set(BreakContractSettlementOwner::getInvoiceImg, invoiceImg) .set(BreakContractSettlementOwner::getInvoiceImg, invoiceImg)
.set(BreakContractSettlementOwner::getStatus, BreakContractSettlementOwnerEnum.Status.OWNER_TO_BE_CONFIRMED.getCode()) .set(BreakContractSettlementOwner::getStatus, BreakContractSettlementOwnerEnum.Status.OWNER_TO_BE_CONFIRMED.getCode())
); );
......
...@@ -100,7 +100,7 @@ public class BreakContractOwnerRecordServiceImpl implements BreakContractOwnerR ...@@ -100,7 +100,7 @@ public class BreakContractOwnerRecordServiceImpl implements BreakContractOwnerR
//货主违约结算单 //货主违约结算单
BreakContractSettlementOwner breakOwner = breakContractSettlementOwnerStruct.convert(breakOwnerDetail); BreakContractSettlementOwner breakOwner = breakContractSettlementOwnerStruct.convert(breakOwnerDetail);
breakOwner.setStatus(BreakContractSettlementOwnerEnum.Status.TO_BE_LOCKED.getCode()); breakOwner.setStatus(BreakContractSettlementOwnerEnum.Status.TO_BE_ACCOUNT.getCode());
record.setSettlementNo(settlementNo); record.setSettlementNo(settlementNo);
//保存违约记录 //保存违约记录
......
...@@ -131,7 +131,7 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe ...@@ -131,7 +131,7 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe
public void uploadInvoiceImg(CarrierUploadInvoiceImgParam param) { public void uploadInvoiceImg(CarrierUploadInvoiceImgParam param) {
BreakContractSettlementOwner settlementOwner = breakContractSettlementOwnerDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND); BreakContractSettlementOwner settlementOwner = breakContractSettlementOwnerDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
if(!Objects.equals(settlementOwner.getStatus(), BreakContractSettlementOwnerEnum.Status.TO_BE_LOCKED.getCode())){ if(!Objects.equals(settlementOwner.getStatus(), BreakContractSettlementOwnerEnum.Status.TO_BE_ACCOUNT.getCode())){
throw new ServiceSystemException(PerformanceResultEnum.STATUS_CHANGED); throw new ServiceSystemException(PerformanceResultEnum.STATUS_CHANGED);
} }
breakContractSettlementOwnerDao.uploadInvoiceImg(param.getId(),param.getInvoiceImg()); breakContractSettlementOwnerDao.uploadInvoiceImg(param.getId(),param.getInvoiceImg());
...@@ -147,11 +147,11 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe ...@@ -147,11 +147,11 @@ public class BreakContractSettlementOwnerServiceImpl implements BreakContractSe
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void updateCancelSettlement(CarrierCancelSettlementParam param) { public void updateCancelSettlement(CarrierCancelSettlementParam param) {
BreakContractSettlementOwner settlementOwner = breakContractSettlementOwnerDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND); BreakContractSettlementOwner settlementOwner = breakContractSettlementOwnerDao.getEntityByKey(param.getId()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
if(!Objects.equals(settlementOwner.getStatus(), BreakContractSettlementOwnerEnum.Status.TO_BE_LOCKED.getCode())){ if(!Objects.equals(settlementOwner.getStatus(), BreakContractSettlementOwnerEnum.Status.TO_BE_ACCOUNT.getCode())){
throw new ServiceSystemException(PerformanceResultEnum.STATUS_CHANGED); throw new ServiceSystemException(PerformanceResultEnum.STATUS_CHANGED);
} }
breakContractSettlementOwnerDao.updateStatus(param.getId(),BreakContractSettlementOwnerEnum.Status.TO_BE_LOCKED.getCode(),BreakContractSettlementOwnerEnum.Status.CANCEL.getCode()); breakContractSettlementOwnerDao.updateStatus(param.getId(),BreakContractSettlementOwnerEnum.Status.TO_BE_ACCOUNT.getCode(),BreakContractSettlementOwnerEnum.Status.CANCEL.getCode());
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo(); UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
//保存结算单日志----取消结算单 //保存结算单日志----取消结算单
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论