ufo / ufo-platform · Commits

Go to a project

Authored by caoyan
Commit 00a8816547827d595a9b37fffb0f96f4db9de1be 2 parents 2ba2bc4e 74ddae89

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

Inline Side-by-side
Showing 1 changed file with 2 additions and 1 deletions
@@ -217,7 +217,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -217,7 +217,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
217 //处理中 217 //处理中
218 private static final List<Byte> processingList = Lists.newArrayList(Constant.CANCEL_QUALITY_CHECK_FAKE.getByteVal(),//已取消（商品质检不通过） 218 private static final List<Byte> processingList = Lists.newArrayList(Constant.CANCEL_QUALITY_CHECK_FAKE.getByteVal(),//已取消（商品质检不通过）
219 Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal(),//平台鉴定通过 219 Constant.BUYER_ORDER_STATUS_JUDGE_PASS.getByteVal(),//平台鉴定通过
220 - Constant.BUYER_ORDER_STATUS_JUDGE_NOT_PASS.getByteVal());//已取消（商品鉴定不通过） 220 + Constant.BUYER_ORDER_STATUS_JUDGE_NOT_PASS.getByteVal(),//已取消（商品鉴定不通过）
  221 + Constant.BUYER_ORDER_STATUS_BUYER_CANCEL_AFTER_SELLER_DELIVERY.getByteVal());//已取消(买家在卖家发货后取消订单)
221 222
222 //已发货 223 //已发货
223 private static final List<Byte> alreadyDeliverList = Lists.newArrayList(Constant.BUYER_ORDER_STATUS_TO_BE_RECEIVED.getByteVal(),//平台已发货 224 private static final List<Byte> alreadyDeliverList = Lists.newArrayList(Constant.BUYER_ORDER_STATUS_TO_BE_RECEIVED.getByteVal(),//平台已发货