Merge branch 'hotfix_depositFee_20190718' into test6.9.9

@@ -2044,18 +2044,24 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService, ApplicationCon
 			}
 			}
 		}
 		}
 
 
-
+		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);
 		StorageDeposit deposit = storageDepositMapper.selectByOrderCode(orderCode);
 		if(null == deposit) {
 		if(null == deposit) {
 			return;
 			return;
 		}
 		}
+		
 		DepositOrder depositOrder = depositOrderMapper.selectByDepositCode(deposit.getDepositCode());
 		DepositOrder depositOrder = depositOrderMapper.selectByDepositCode(deposit.getDepositCode());
 		if(null == depositOrder) {
 		if(null == depositOrder) {
 			return;
 			return;
 		}
 		}
 		
 		
-		resp.setPickAmount(null == depositOrder.getAmount() ? "-" : String.format("%.2f", depositOrder.getAmount().doubleValue()));
-
+		resp.setPickAmount(null == depositOrder.getAmount() ? "0.00" : String.format("%.2f", depositOrder.getAmount().doubleValue()));
 	}
 	}