Merge remote-tracking branch 'origin/test6.9.10' into test6.9.10

@@ -516,6 +516,9 @@ public class AppraiseService {
     // 3.鉴定通过
     // 3.鉴定通过
     List<Integer> APPRAISE_SUCCESS_STATUS_CODE = Lists.newArrayList(AppraiseOrderStatus.JUDGE_PASS.getCode());
     List<Integer> APPRAISE_SUCCESS_STATUS_CODE = Lists.newArrayList(AppraiseOrderStatus.JUDGE_PASS.getCode());
 
 
+    // 3.鉴定通过待寄存, 主动召回的时候需要发货
+    List<Integer> APPRAISE_SUCCESS_STATUS_WAREHOUSE_CODE = Lists.newArrayList(AppraiseOrderStatus.JUDGE_PASS_WAIT_WAREHOUSE.getCode());
+
     /**
     /**
      * 现货寄存 and 现货鉴定 发货用<br><br/>
      * 现货寄存 and 现货鉴定 发货用<br><br/>
      *  鉴定结果为以下场景，寄回
      *  鉴定结果为以下场景，寄回
@@ -544,7 +547,8 @@ public class AppraiseService {
 
 
         if(!APPRAISE_FAIL_STATUS_CODE.contains(appraiseOrder.getStatus())
         if(!APPRAISE_FAIL_STATUS_CODE.contains(appraiseOrder.getStatus())
                 && !CANNOT_APPRAISE_STATUS_CODE.contains(appraiseOrder.getStatus())
                 && !CANNOT_APPRAISE_STATUS_CODE.contains(appraiseOrder.getStatus())
-                && !APPRAISE_SUCCESS_STATUS_CODE.contains(appraiseOrder.getStatus())){
+                && !APPRAISE_SUCCESS_STATUS_CODE.contains(appraiseOrder.getStatus())
+                && !APPRAISE_SUCCESS_STATUS_WAREHOUSE_CODE.contains(appraiseOrder.getStatus())){  //鉴定通过待寄存, 主动召回的时候需要发货
 
 
             LOGGER.warn("deliveryForAppraise status {}, orderCode {}", appraiseOrder.getStatus(), orderCode);
             LOGGER.warn("deliveryForAppraise status {}, orderCode {}", appraiseOrder.getStatus(), orderCode);
             throw new ServiceException(ServiceError.ORDER_STATUS_INVALIDATE);
             throw new ServiceException(ServiceError.ORDER_STATUS_INVALIDATE);
@@ -563,7 +567,8 @@ public class AppraiseService {
                 expressInfoService.returnBackCauseOfBuyerCancelAfterSellerSendOut(uid, expressCompanyId, orderCode, wayBillCode, depotNum, mobile, true);
                 expressInfoService.returnBackCauseOfBuyerCancelAfterSellerSendOut(uid, expressCompanyId, orderCode, wayBillCode, depotNum, mobile, true);
             }
             }
             // 3.鉴定通过
             // 3.鉴定通过
-            else if(APPRAISE_SUCCESS_STATUS_CODE.contains(appraiseOrder.getStatus())){
+            else if(APPRAISE_SUCCESS_STATUS_CODE.contains(appraiseOrder.getStatus()) ||
+                    APPRAISE_SUCCESS_STATUS_WAREHOUSE_CODE.contains(appraiseOrder.getStatus())){
                 expressInfoService.deliverGoods(appraiseOrder.getUid(),
                 expressInfoService.deliverGoods(appraiseOrder.getUid(),
                         appraiseExpressInfoBo.getExpressCompanyId(),
                         appraiseExpressInfoBo.getExpressCompanyId(),
                         appraiseOrder.getOrderCode(),
                         appraiseOrder.getOrderCode(),