Authored by chenchao

Merge branch 'test6.8.6' of http://git.yoho.cn/ufo/yohoufo-fore into test6.8.6

@@ -92,10 +92,6 @@ public class StoredSellerDepositServiceImpl implements IStoredSellerDepositServi @@ -92,10 +92,6 @@ public class StoredSellerDepositServiceImpl implements IStoredSellerDepositServi
92 throw new ServiceException(ServiceError.ORDER_REQUEST_PARM_IS_EMPTY); 92 throw new ServiceException(ServiceError.ORDER_REQUEST_PARM_IS_EMPTY);
93 } 93 }
94 94
95 - if (!merchantOrderPaymentService.canRejoin(uid)) {  
96 - throw new UfoServiceException(400, "入驻次数已经达到上限!");  
97 - }  
98 -  
99 BigDecimal amount = getValidMoney(shoppingRequest.getAmount()); 95 BigDecimal amount = getValidMoney(shoppingRequest.getAmount());
100 if (amount==null||amount.compareTo(BigDecimal.ZERO) <= 0) { 96 if (amount==null||amount.compareTo(BigDecimal.ZERO) <= 0) {
101 throw new UfoServiceException(400, "金额不合法,预存金额必须大于0"); 97 throw new UfoServiceException(400, "金额不合法,预存金额必须大于0");