Authored by LUOXC

Merge branch 'hotfix-20190808' into test6.9.10

... ... @@ -76,7 +76,7 @@ public final class SellerOrderConvertor {
String payPercent = (feeRateExists = (serviceFeeRate=computeResult.getServiceFeeRate()) != null) ? serviceFeeRate.getPayChannelPercent() : "";
BigDecimal goodsPaymentRate;
String goodsPaymentRatePercent = "";
if (feeRateExists && (goodsPaymentRate=serviceFeeRate.getGoodsPaymentRate()) != null && goodsPaymentRate.compareTo(BigDecimal.ZERO) > 0){
if (feeRateExists && (goodsPaymentRate=serviceFeeRate.getGoodsPaymentRate()) != null && goodsPaymentRate.compareTo(BigDecimal.ZERO) >= 0){
goodsPaymentRatePercent = MathUtils.convert2Percent(goodsPaymentRate);
}else{
Map<String,String> tipsConfig = tipsConfigSupplier.get();
... ...