|
@@ -296,14 +296,14 @@ public class SettlementOrderLogic {
|
|
|
|
|
|
if (settlementOrderService.lambdaQuery()
|
|
if (settlementOrderService.lambdaQuery()
|
|
.in(SettlementOrder::getSettlementOrderId, id)
|
|
.in(SettlementOrder::getSettlementOrderId, id)
|
|
- .notIn(SettlementOrder::getStatus, SettlementStatusEnum.WAIT.getKey())
|
|
|
|
|
|
+ .notIn(SettlementOrder::getStatus, SettlementStatusNewEnum.YC.getKey())
|
|
.count() > 0) {
|
|
.count() > 0) {
|
|
- throw new RemoteServiceException("存在非待结算得结算");
|
|
|
|
|
|
+ throw new RemoteServiceException("存在非异常结算得结算单");
|
|
}
|
|
}
|
|
|
|
|
|
settlementOrderService.lambdaUpdate()
|
|
settlementOrderService.lambdaUpdate()
|
|
.in(SettlementOrder::getSettlementOrderId, id)
|
|
.in(SettlementOrder::getSettlementOrderId, id)
|
|
- .eq(SettlementOrder::getStatus, SettlementStatusEnum.WAIT.getKey())
|
|
|
|
|
|
+ .eq(SettlementOrder::getStatus, SettlementStatusNewEnum.YC.getKey())
|
|
.set(SettlementOrder::getStatus, SettlementStatusNewEnum.LINE.getKey()).update();
|
|
.set(SettlementOrder::getStatus, SettlementStatusNewEnum.LINE.getKey()).update();
|
|
}
|
|
}
|
|
}
|
|
}
|