ufo / yohoufo-fore · Commits

Go to a project

Authored by tanling
Commit a7c641a38385fa78244cc5a2a21bd525a920cd11 1 parent 6bd3e9c7

现货寄存-整单虚假发货，需要展示物流

Inline Side-by-side
Showing 2 changed files with 6 additions and 4 deletions
@@ -55,7 +55,8 @@ public class AppraiseExpressStageBuilder { @@ -55,7 +55,8 @@ public class AppraiseExpressStageBuilder {
55 55
56 // 父订单 56 // 父订单
57 if (Objects.isNull(appraiseOrder.getParentOrderCode())){ 57 if (Objects.isNull(appraiseOrder.getParentOrderCode())){
58 - if (status == AppraiseOrderStatus.SELLER_SEND_OUT.getCode()){ 58 + if (status == AppraiseOrderStatus.SELLER_SEND_OUT.getCode()
  59 + || status == AppraiseOrderStatus.SHAM_SEND_OUT.getCode()){
59 return DEPOSIT_USER_DELIVERY; 60 return DEPOSIT_USER_DELIVERY;
60 }else if (status == AppraiseOrderStatus.PLATFORM_RECEIVE.getCode() 61 }else if (status == AppraiseOrderStatus.PLATFORM_RECEIVE.getCode()
61 || status == AppraiseOrderStatus.FINISH.getCode()){ 62 || status == AppraiseOrderStatus.FINISH.getCode()){
@@ -813,11 +813,12 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -813,11 +813,12 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
813 } 813 }
814 814
815 }else{ 815 }else{
816 - // 父订单状态: 卖家已发货 平台确认收货 平台鉴定完成  
817 - if (AppraiseOrderStatus.SELLER_SEND_OUT.getCode() == status) { 816 + // 整单虚假发货也需要展示物流
  817 + if (AppraiseOrderStatus.SELLER_SEND_OUT.getCode() == status
  818 + || AppraiseOrderStatus.SHAM_SEND_OUT.getCode() == status) {
818 return Arrays.asList(EnumExpressType.EXPRESS_TYPE_1.getCode()); 819 return Arrays.asList(EnumExpressType.EXPRESS_TYPE_1.getCode());
819 } 820 }
820 - // 这些状态需要展示 平台鉴定 821 + // 已经已经发，交易完成
821 else if (AppraiseOrderStatus.PLATFORM_RECEIVE.getCode() == status 822 else if (AppraiseOrderStatus.PLATFORM_RECEIVE.getCode() == status
822 || AppraiseOrderStatus.FINISH.getCode() == status) { 823 || AppraiseOrderStatus.FINISH.getCode() == status) {
823 return Arrays.asList(EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode(), EnumExpressType.EXPRESS_TYPE_1.getCode()); 824 return Arrays.asList(EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode(), EnumExpressType.EXPRESS_TYPE_1.getCode());