ufo / ufo-platform · Commits

Go to a project

Authored by caoyan
Commit 123deb2fc672145f08f85027e72eef7b910396fd 2 parents b0d8ad33 6e943577

Merge branch 'dev6.8.6.5-platform-quality4app' into test6.8.6.5

Inline Side-by-side
Showing 1 changed file with 4 additions and 8 deletions
... ... @@ -210,15 +210,13 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
//问题单
private static final Byte QC_STATUS_PROBLEM = 3;
//已收货
private static final List<Byte> receivedList = Lists.newArrayList(Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal(), //平台质检中
Constant.BUYER_ORDER_STATUS_JUDGING.getByteVal());//平台鉴定中
//待处理
private static final List<Byte> receivedList = Lists.newArrayList(Constant.BUYER_ORDER_STATUS_PLATFORM_RECEIVE.getByteVal()); //平台质检中
//处理中
//待发货
private static final List<Byte> processingList = Lists.newArrayList(Constant.CANCEL_QUALITY_CHECK_FAKE.getByteVal(),//已取消（商品质检不通过）
Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal(),//平台鉴定通过
Constant.BUYER_ORDER_STATUS_JUDGE_NOT_PASS.getByteVal(),//已取消（商品鉴定不通过）
Constant.BUYER_ORDER_STATUS_BUYER_CANCEL_AFTER_SELLER_DELIVERY.getByteVal());//已取消(买家在卖家发货后取消订单)
Constant.BUYER_ORDER_STATUS_JUDGE_NOT_PASS.getByteVal());//已取消（商品鉴定不通过）
//已发货
private static final List<Byte> alreadyDeliverList = Lists.newArrayList(Constant.BUYER_ORDER_STATUS_TO_BE_RECEIVED.getByteVal(),//平台已发货
... ... @@ -231,8 +229,6 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
//问题单
private static final List<Byte> problemList = Lists.newArrayList(Constant.BUYER_ORDER_STATUS_MINI_FAULT_WAITING.getByteVal(),//瑕疵确认中
Constant.BUYER_ORDER_STATUS_MINI_FAULT_ACCEPT.getByteVal(),//瑕疵确认通过
Constant.BUYER_ORDER_STATUS_JUDGING.getByteVal(),//平台鉴定中
Constant.BUYER_ORDER_STATUS_JUDGE_NOT_PASS.getByteVal(),//已取消（鉴定不通过）
Constant.CANCEL_MINI_FAULT_REJECT.getByteVal(),//已取消（瑕疵确认不通过）
Constant.CANCEL_MINI_FAULT_OUT_TIME_REJECT.getByteVal());//已取消（瑕疵确认超时）
... ...