Authored by 郝肖肖

Merge branch 'feature/yohoCoin' into release/5.2

... ... @@ -1619,7 +1619,6 @@ class CartModel
} else if ($yohoCoinData['useYohoCoin'] > 0 || $yohoCoinData['yohoCoin'] > 0) {
$yohoCoinData['yohoCoinMsg'] = '可抵¥' . ($yohoCoinData['useYohoCoin'] > 0 ? $yohoCoinData['useYohoCoin'] : $yohoCoinData['yohoCoin']);
$yohoCoinData['yohoCoinClick'] = 1;
$yohoCoinData['yohoCoinNum'] = ($yohoCoinData['useYohoCoin'] > 0 ? $yohoCoinData['useYohoCoin'] : $yohoCoinData['yohoCoin']) * 100;
} else {
$yohoCoinData['yohoCoinMsg'] = "抱歉,您的订单实付款不满足有货币使用条件";
}
... ...