fix bugs

@@ -63,7 +63,7 @@ public class AppraiseExpressStageBuilder {
                 if (status == AppraiseOrderStatus.SELLER_SEND_OUT.getCode()){
                     return DEPOSIT_USER_DELIVERY;
                 }else if (status == AppraiseOrderStatus.PLATFORM_RECEIVE.getCode()
-                        || status == AppraiseOrderStatus.JUDGE_PASS.getCode()){
+                        || status == AppraiseOrderStatus.FINISH.getCode()){
                     return DEPOSIT_PLATFORM_RECEIPT;
                 }
 
@@ -71,7 +71,9 @@ public class AppraiseExpressStageBuilder {
             // 子订单
             else{
 
-                if (status == AppraiseOrderStatus.WAITING_RECEIVE.getCode()){
+                if (status == AppraiseOrderStatus.CHECKING_FAKE.getCode()
+                        || status == AppraiseOrderStatus.QUALITY_CHECK_FAKE.getCode()
+                        || status == AppraiseOrderStatus.PLATFORM_APPRAISE_UNSURE.getCode()){
                     return DEPOSIT_PLATFORM_DELIVER;
                 }
 

@@ -226,7 +226,6 @@ public class AppraiseOrderService extends AbsGoodsServiceOrderService implements
                 add(AppraiseOrderStatus.SELLER_SEND_OUT.getCode());
                 add(AppraiseOrderStatus.PLATFORM_RECEIVE.getCode());
                 add(AppraiseOrderStatus.JUDGE_PASS.getCode());
-                add(AppraiseOrderStatus.WAITING_RECEIVE.getCode());
                 add(AppraiseOrderStatus.CHECKING_FAKE.getCode());
                 add(AppraiseOrderStatus.SHAM_SEND_OUT.getCode());
                 add(AppraiseOrderStatus.PLATFORM_APPRAISE_UNSURE.getCode());

@@ -714,11 +714,11 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
                 expressInfoService.saveOperateTransferExpressInfo(existenceNode.getAppraiseOrder().getUid(), orderCode ,expressType.getCode(),expressDataType,operateTransferCode);
                 return;
             }
-            List<Integer> status = Lists.newArrayList(AppraiseOrderStatus.PLATFORM_RECEIVE.getCode(), AppraiseOrderStatus.CHECKING_FAKE.getCode());
+            // 上一个状态是[卖家已发货] 该父订单下状态为[卖家已发货]的子订单数量为0，代表父订单状态应该为 [已收货]
+            List<Integer> status = Lists.newArrayList(AppraiseOrderStatus.SELLER_SEND_OUT.getCode());
             int cnt = serviceOrderProcessor.getSubOrderCntNotDefinedStatus(parentOrderCode, status);
             logger.info("no confirm delivery sub order cnt is {}, parentOrderCode {}", cnt, parentOrderCode);
 
-            // 父订单下所有的子订单都是 [平台已收货] or [虚假发货] 的情况
             if (cnt == 0){
                 // 平台收货 内部调拨信息
                 EnumExpressType expressType = EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER;

@@ -561,6 +561,11 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
 
     }
 
+    List<Integer> expressInfoStatus = Lists.newArrayList(AppraiseOrderStatus.SELLER_SEND_OUT.getCode(),
+            AppraiseOrderStatus.JUDGE_PASS.getCode(),
+            AppraiseOrderStatus.CHECKING_FAKE.getCode(),
+            AppraiseOrderStatus.QUALITY_CHECK_FAKE.getCode(),
+            AppraiseOrderStatus.PLATFORM_APPRAISE_UNSURE.getCode());
 
     /**
      * 付费鉴定 and 付费寄存 物流信息
@@ -579,8 +584,8 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
         if (appraiseOrder.getAttributes() == AppraiseOrderAttributes.PAID_APPRAISE.getCode()){
 
             // 用户发货, 待用户收货 只有这两个状态展示物流
-            throwServiceExceptionIf(appraiseOrder.getStatus() != AppraiseOrderStatus.SELLER_SEND_OUT.getCode()
-                    && appraiseOrder.getStatus() != AppraiseOrderStatus.WAITING_RECEIVE.getCode(), "不展示物流信息");
+            throwServiceExceptionIf(!expressInfoStatus.contains(appraiseOrder.getStatus()),
+                    "不展示物流信息");
 
             List<Integer> expressTypeList = getAppraiseExpressType(appraiseOrder);
             if (CollectionUtils.isEmpty(expressTypeList)) {
@@ -773,7 +778,10 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
             // 用户发货
             if(status == AppraiseOrderStatus.SELLER_SEND_OUT.getCode()){
                 return Arrays.asList(EnumExpressType.EXPRESS_TYPE_1.getCode());
-            }else if(status == AppraiseOrderStatus.WAITING_RECEIVE.getCode()){
+            }else if(status == AppraiseOrderStatus.JUDGE_PASS.getCode()
+                || status == AppraiseOrderStatus.CHECKING_FAKE.getCode()
+                 || status == AppraiseOrderStatus.QUALITY_CHECK_FAKE.getCode()
+                  || status == AppraiseOrderStatus.PLATFORM_APPRAISE_UNSURE.getCode()){
                 return Arrays.asList(EnumExpressType.EXPRESS_TYPE_2.getCode(),
                         EnumExpressType.EXPRESS_TYPE_3.getCode(),
                         EnumExpressType.EXPRESS_TYPE_REBACK.getCode());
@@ -787,7 +795,9 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
             if (isSubOrder){
 
                 // 子订单状态: 虚假发货，质检不通过， 鉴定通过，鉴定不通过，无法鉴定，等待用户收货
-                if (status == AppraiseOrderStatus.WAITING_RECEIVE.getCode()){
+                if (status == AppraiseOrderStatus.CHECKING_FAKE.getCode()
+                        || status == AppraiseOrderStatus.QUALITY_CHECK_FAKE.getCode()
+                        || status == AppraiseOrderStatus.PLATFORM_APPRAISE_UNSURE.getCode()){
                     return Arrays.asList(EnumExpressType.EXPRESS_TYPE_2.getCode(),
                             EnumExpressType.EXPRESS_TYPE_3.getCode(),
                             EnumExpressType.EXPRESS_TYPE_REBACK.getCode());
@@ -800,7 +810,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
                 }
                 // 这些状态需要展示 平台鉴定
                 else if (AppraiseOrderStatus.PLATFORM_RECEIVE.getCode() == status
-                        || AppraiseOrderStatus.JUDGE_PASS.getCode() == status) {
+                        || AppraiseOrderStatus.FINISH.getCode() == status) {
                     return Arrays.asList(EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode(), EnumExpressType.EXPRESS_TYPE_1.getCode());
                 }
             }

@@ -43,15 +43,6 @@ public class SellerDepositOrderDetailService extends AbsOrderViewService {
     private AppraiseOrderMapper appraiseOrderMapper;
 
     @Autowired
-    private AppraiseOrderGoodsMapper appraiseOrderGoodsMapper;
-
-    @Autowired
-    private AppraiseOrderStorageMapper appraiseOrderStorageMapper;
-
-    @Autowired
-    private AppraiseOrderMetaMapper appraiseOrderMetaMapper;
-
-    @Autowired
     private AppraiseOrderMetaService appraiseOrderMetaService;
 
     @Autowired
@@ -65,7 +56,6 @@ public class SellerDepositOrderDetailService extends AbsOrderViewService {
 
 
     private static final List<Integer> showEXpressInfoStatusList = Lists.newArrayList(AppraiseOrderStatus.SELLER_SEND_OUT.getCode(),
-            AppraiseOrderStatus.WAITING_RECEIVE.getCode(),
             AppraiseOrderStatus.PLATFORM_RECEIVE.getCode(),
             AppraiseOrderStatus.JUDGE_PASS.getCode(),
             AppraiseOrderStatus.CHECKING_FAKE.getCode(),
@@ -74,14 +64,12 @@ public class SellerDepositOrderDetailService extends AbsOrderViewService {
     private static final List<Integer> showUserAddressStatusList = Lists.newArrayList(
             AppraiseOrderStatus.HAS_PAYED.getCode(),
             AppraiseOrderStatus.SELLER_SEND_OUT.getCode(),
-            AppraiseOrderStatus.WAITING_RECEIVE.getCode(),
             AppraiseOrderStatus.PLATFORM_RECEIVE.getCode(),
             AppraiseOrderStatus.JUDGE_PASS.getCode(),
             AppraiseOrderStatus.CHECKING_FAKE.getCode(),
             AppraiseOrderStatus.PLATFORM_APPRAISE_UNSURE.getCode()
     );
     private static final List<Integer> showAppraiseAddressStatusList = Lists.newArrayList(AppraiseOrderStatus.SELLER_SEND_OUT.getCode(),
-            AppraiseOrderStatus.WAITING_RECEIVE.getCode(),
             AppraiseOrderStatus.PLATFORM_RECEIVE.getCode(),
             AppraiseOrderStatus.JUDGE_PASS.getCode(),
             AppraiseOrderStatus.CHECKING_FAKE.getCode(),