|
@@ -1487,7 +1487,7 @@ class Sell
|
|
|
if ($code) {
|
|
if ($code) {
|
|
|
$card_info = Dever::db('card/info')->find($code['card_id']);
|
|
$card_info = Dever::db('card/info')->find($code['card_id']);
|
|
|
if ($card_info) {
|
|
if ($card_info) {
|
|
|
- $info['card'] = '（' . $card_info['name'] . '，面值：'.$code['total_cash'].', 剩余：'.round($code['total_cash']-$code['use_cash'], 2).'）';
|
|
|
|
|
|
|
+ $info['card'] = '（' . $card_info['name'] .$card_info['card']. '，面值：'.$code['total_cash'].', 剩余：'.round($code['total_cash']-$code['use_cash'], 2).'）';
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
@@ -1528,7 +1528,7 @@ class Sell
|
|
|
array
|
|
array
|
|
|
(
|
|
(
|
|
|
array('礼品卡抵扣', '¥ ' . round($info['card_code_cash'], 2) . $info['card']),
|
|
array('礼品卡抵扣', '¥ ' . round($info['card_code_cash'], 2) . $info['card']),
|
|
|
- array('钱包抵扣', '¥ ' . round($info['wallet_cash'], 2)),
|
|
|
|
|
|
|
+ //array('钱包抵扣', '¥ ' . round($info['wallet_cash'], 2)),
|
|
|
array('抹零', '¥ ' . round($info['kou_cash'], 2)),
|
|
array('抹零', '¥ ' . round($info['kou_cash'], 2)),
|
|
|
),
|
|
),
|
|
|
|
|
|
rabin