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

@@ -747,6 +747,15 @@ public class PaymentServiceImpl implements IPaymentService {
 			BigDecimal ensure = metavalue.getJSONObject("earnestMoney").getBigDecimal("earnestMoney");
 			// 保证金抽成
 			BigDecimal ensureYohoRage = metavalue.getJSONObject("serviceFeeRate").getBigDecimal("earnestMoneyRate");
+			if (ensureYohoRage.compareTo(BigDecimal.ZERO) < 0 || ensureYohoRage.compareTo(BigDecimal.ONE) > 0) {
+				logger.warn("计费信息错误:保证金抽成, sellerUid is {}, skup is {}, err is {}", sellerUid, skup,
+						"保证金抽成有误：" + ensureYohoRage);
+				return null;
+			}
+			if (ensure.compareTo(BigDecimal.ZERO) < 0) {
+				logger.warn("计费信息错误:保证金, sellerUid is {}, skup is {}, err is {}", sellerUid, skup, "保证金：" + ensure);
+				return null;
+			}
 			return ensure.multiply(BigDecimal.ONE.subtract(ensureYohoRage)).setScale(2, BigDecimal.ROUND_HALF_UP);
 		} catch (Exception e) {
 			logger.warn("计费信息不完整, sellerUid is {}, skup is {}, err is {}", sellerUid, skup, e.getMessage());