手机质检：发货

@@ -182,13 +182,35 @@ public class AppraiseService {
         }
         }
 
 
         OrderStatus expectStatus;
         OrderStatus expectStatus;
-        if (buyerOrder.getStatus() != OrderStatus.CHECKING_FAKE.getCode()){
+
+        int type = 0 ;//鉴定不通过
+        if (buyerOrder.getStatus() == OrderStatus.CHECKING_FAKE.getCode()){
             expectStatus = OrderStatus.CHECKING_FAKE;
             expectStatus = OrderStatus.CHECKING_FAKE;
-        }else if(buyerOrder.getStatus() != OrderStatus.QUALITY_CHECK_FAKE.getCode()){
+
+            //TODO  新版本6.8.7以后，判断type可直接根据状态，而不再需要根据qualityCheck,可去掉以下if判断
+            //TODO  现在6.8.6.5手机质检版本上线，还需要保留，存在过度订单，鉴定不通过都是类型：13
+            QualityCheck qualityCheck = qualityCheckMapper.selectByOrderCode(orderCode);
+            if(qualityCheck!=null&&qualityCheck.getType()!=null){
+                if(EnumQualityCheckType.CHECK_NOT_PASS.getCode().intValue()==qualityCheck.getType().intValue()){
+                    type = 1;//质检不通过
+                }else if(EnumQualityCheckType.MINI_FAULT.getCode().intValue()==qualityCheck.getType().intValue()){
+                    if(qualityCheck.getStatus()!=null){
+                        if(EnumQualityCheckStatus.REJECT_BY_BUYER.getCode().intValue()==qualityCheck.getStatus().intValue()){
+                            type = 2;//用户不接受瑕疵
+                        }else if(EnumQualityCheckStatus.REJECT_BY_OUTER_TIME.getCode().intValue()==qualityCheck.getStatus().intValue()){
+                            type = 3;//用户不接受超时
+                        }
+                    }
+                }
+            }
+        }else if(buyerOrder.getStatus() == OrderStatus.QUALITY_CHECK_FAKE.getCode()){
+            type = 1;//质检不通过
             expectStatus = OrderStatus.QUALITY_CHECK_FAKE;
             expectStatus = OrderStatus.QUALITY_CHECK_FAKE;
-        }else if(buyerOrder.getStatus() != OrderStatus.MINI_FAULT_REJECT.getCode()){
+        }else if(buyerOrder.getStatus() == OrderStatus.MINI_FAULT_REJECT.getCode()){
+            type = 2;//用户不接受瑕疵
             expectStatus = OrderStatus.MINI_FAULT_REJECT;
             expectStatus = OrderStatus.MINI_FAULT_REJECT;
-        }else if(buyerOrder.getStatus() != OrderStatus.MINI_FAULT_OUT_TIME_REJECT.getCode()){
+        }else if(buyerOrder.getStatus() == OrderStatus.MINI_FAULT_OUT_TIME_REJECT.getCode()){
+            type = 3;//用户不接受超时
             expectStatus = OrderStatus.MINI_FAULT_OUT_TIME_REJECT;
             expectStatus = OrderStatus.MINI_FAULT_OUT_TIME_REJECT;
         }else{
         }else{
         //if (buyerOrder.getStatus() != expectStatus.getCode()){
         //if (buyerOrder.getStatus() != expectStatus.getCode()){
@@ -207,21 +229,6 @@ public class AppraiseService {
         SellerOrderGoods sellerOrderGoods = cleanCacheAfterUpdateStatus(buyerOrder.getOrderCode(),buyerOrder.getUid(),buyerOrder.getSellerUid());
         SellerOrderGoods sellerOrderGoods = cleanCacheAfterUpdateStatus(buyerOrder.getOrderCode(),buyerOrder.getUid(),buyerOrder.getSellerUid());
 
 
         //发消息给卖家
         //发消息给卖家
-        QualityCheck qualityCheck = qualityCheckMapper.selectByOrderCode(orderCode);
-        int type = 0 ;//鉴定不通过
-        if(qualityCheck!=null&&qualityCheck.getType()!=null){
-            if(EnumQualityCheckType.CHECK_NOT_PASS.getCode().intValue()==qualityCheck.getType().intValue()){
-                type = 1;//质检不通过
-            }else if(EnumQualityCheckType.MINI_FAULT.getCode().intValue()==qualityCheck.getType().intValue()){
-                if(qualityCheck.getStatus()!=null){
-                    if(EnumQualityCheckStatus.REJECT_BY_BUYER.getCode().intValue()==qualityCheck.getStatus().intValue()){
-                        type = 2;//用户不接受瑕疵
-                    }else if(EnumQualityCheckStatus.REJECT_BY_OUTER_TIME.getCode().intValue()==qualityCheck.getStatus().intValue()){
-                        type = 3;//用户不接受超时
-                    }
-                }
-            }
-        }
         inBoxFacade.sellerQualityCheckNotPass_send_back(sellerOrderGoods,orderCode,wayBillCode, type);
         inBoxFacade.sellerQualityCheckNotPass_send_back(sellerOrderGoods,orderCode,wayBillCode, type);
     }
     }