记得上下班打卡 | git大法好,push需谨慎

Commit f2be0358 authored by zhengfuxin's avatar zhengfuxin

Merge branch 'master' into dev-0315dragon

parents 44449a66 cc84ac0c
...@@ -411,6 +411,7 @@ public class KylinRefundsStatusServiceImpl { ...@@ -411,6 +411,7 @@ public class KylinRefundsStatusServiceImpl {
); );
if (!Objects.equals(orderRefundsOld.getStatus(), KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED) if (!Objects.equals(orderRefundsOld.getStatus(), KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED)
&& !Objects.equals(orderRefundsOld.getStatus(), KylinTableStatusConst.ORDER_REFUND_STATUS_TICKET) && !Objects.equals(orderRefundsOld.getStatus(), KylinTableStatusConst.ORDER_REFUND_STATUS_TICKET)
&& !Objects.equals(orderRefundsOld.getStatus(), KylinTableStatusConst.ORDER_REFUND_STATUS_ERROR)
) { ) {
continue; continue;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment