ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit f6d19119c9b6e69e9716aeaa346b41f5ac072b56 1 parent 3b08509f

refactor

Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
@@ -109,6 +109,7 @@ public class ExpressStageBuilder { @@ -109,6 +109,7 @@ public class ExpressStageBuilder {
109 109
110 int status = buyerOrder.getStatus(); 110 int status = buyerOrder.getStatus();
111 111
  112 + // 寄存订单
112 if (BuyerOrderUtils.isDeposit(buyerOrder)) { 113 if (BuyerOrderUtils.isDeposit(buyerOrder)) {
113 if (isBuyer) { 114 if (isBuyer) {
114 return OrderStatus.DONE.getCode() == status ? DEPOSIT_DONE : DEPOSIT_BEFORE_DONE; 115 return OrderStatus.DONE.getCode() == status ? DEPOSIT_DONE : DEPOSIT_BEFORE_DONE;
@@ -130,7 +131,7 @@ public class ExpressStageBuilder { @@ -130,7 +131,7 @@ public class ExpressStageBuilder {
130 || OrderStatus.JUDGE_PASS.getCode() == status 131 || OrderStatus.JUDGE_PASS.getCode() == status
131 || OrderStatus.JUDGE_PASS_WAIT_WAREHOUSE.getCode() == status 132 || OrderStatus.JUDGE_PASS_WAIT_WAREHOUSE.getCode() == status
132 || OrderStatus.WAITING_RECEIVE.getCode() == status) { 133 || OrderStatus.WAITING_RECEIVE.getCode() == status) {
133 - return TabType.BUY == actor ? AFTER_DEPOT_RECEIVE : DONE; 134 + return isBuyer ? AFTER_DEPOT_RECEIVE : DONE;
134 } else if (OrderStatus.DONE.getCode() == status) { 135 } else if (OrderStatus.DONE.getCode() == status) {
135 return DONE; 136 return DONE;
136 } else if (OrderStatus.CHECKING_FAKE.getCode() == status 137 } else if (OrderStatus.CHECKING_FAKE.getCode() == status