Merge branch 'hotfix_depositFee_20190718' into test6.9.8

# Conflicts:
#	order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java

@@ -2044,26 +2044,24 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
 			}
 		}
 
-        resp.setPickAmount("0.00");
-		StorageDeposit deposit = storageDepositMapper.selectByOrderCode(orderCode);
-		if(null == deposit) {
-			return;
-		}
-		
 		if(resp.getAttributes().equals(OrderAttributes.QUICK_DELIVER.getCode())) {//闪购
 			resp.setPickAmount(resp.getDepositAmount());
 			resp.setDepositAmount("0.00");
 			return;
 		}
 		
+        resp.setPickAmount("0.00");
+		StorageDeposit deposit = storageDepositMapper.selectByOrderCode(orderCode);
+		if(null == deposit) {
+			return;
+		}
+		
 		DepositOrder depositOrder = depositOrderMapper.selectByDepositCode(deposit.getDepositCode());
 		if(null == depositOrder) {
 			return;
 		}
 		
 		resp.setPickAmount(null == depositOrder.getAmount() ? "0.00" : String.format("%.2f", depositOrder.getAmount().doubleValue()));
-
-
 	}