ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit b4e7aee6637eeed12f00653c5d8064e80f1cce6a 1 parent 1f4caabe

添加状态

Inline Side-by-side
Showing 2 changed files with 9 additions and 1 deletions
@@ -1175,7 +1175,7 @@ public class AppraiseService { @@ -1175,7 +1175,7 @@ public class AppraiseService {
1175 throw new ServiceException(ServiceError.ORDER_NULL); 1175 throw new ServiceException(ServiceError.ORDER_NULL);
1176 } 1176 }
1177 final OrderStatus expectOrderStatus = OrderStatus.PLATFORM_RECEIVE; 1177 final OrderStatus expectOrderStatus = OrderStatus.PLATFORM_RECEIVE;
1178 - final OrderStatus targetOrderStatus = OrderStatus.JUDGE_PASS; 1178 + final OrderStatus targetOrderStatus = BuyerOrderUtils.isDeposit(buyerOrder) ? OrderStatus.JUDGE_PASS_WAIT_WAREHOUSE : OrderStatus.JUDGE_PASS;
1179 1179
1180 if (buyerOrder.getStatus() != expectOrderStatus.getCode()) { 1180 if (buyerOrder.getStatus() != expectOrderStatus.getCode()) {
1181 LOGGER.warn("in judgeCenterPass, buyer Order orderCode {} status {}, expect Order Status is {} ", expectOrderStatus, 1181 LOGGER.warn("in judgeCenterPass, buyer Order orderCode {} status {}, expect Order Status is {} ", expectOrderStatus,
@@ -3,6 +3,7 @@ package com.yohoufo.order.utils; @@ -3,6 +3,7 @@ package com.yohoufo.order.utils;
3 import com.yohobuy.ufo.model.order.bo.OrderInfo; 3 import com.yohobuy.ufo.model.order.bo.OrderInfo;
4 import com.yohobuy.ufo.model.order.common.OrderAttributes; 4 import com.yohobuy.ufo.model.order.common.OrderAttributes;
5 import com.yohobuy.ufo.model.order.common.OrderStatus; 5 import com.yohobuy.ufo.model.order.common.OrderStatus;
  6 +import com.yohoufo.dal.order.model.BuyerOrder;
6 7
7 public class BuyerOrderUtils { 8 public class BuyerOrderUtils {
8 9
@@ -49,4 +50,11 @@ public class BuyerOrderUtils { @@ -49,4 +50,11 @@ public class BuyerOrderUtils {
49 public static boolean isDeposit(Integer attributes) { 50 public static boolean isDeposit(Integer attributes) {
50 return OrderAttributes.getOrderAttributes(attributes) == OrderAttributes.DEPOSITE; 51 return OrderAttributes.getOrderAttributes(attributes) == OrderAttributes.DEPOSITE;
51 } 52 }
  53 +
  54 + /**
  55 + * 是否寄存订单
  56 + */
  57 + public static boolean isDeposit(BuyerOrder buyerOrder) {
  58 + return isDeposit(buyerOrder.getAttributes());
  59 + }
52 } 60 }