|
|
@@ -1481,6 +1481,17 @@ class Sell
|
|
|
|
|
|
$result = array();
|
|
|
|
|
|
+ $info['card'] = '';
|
|
|
+ if ($info['card_code_id']) {
|
|
|
+ $code = Dever::db('card/code')->find($info['card_code_id']);
|
|
|
+ if ($code) {
|
|
|
+ $card_info = Dever::db('card/info')->find($code['card_id']);
|
|
|
+ if ($card_info) {
|
|
|
+ $info['card'] = $card_info['name'];
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
$result[$info['order_num']] = array
|
|
|
(
|
|
|
'type' => 'info',
|
|
|
@@ -1516,7 +1527,7 @@ class Sell
|
|
|
|
|
|
array
|
|
|
(
|
|
|
- array('礼品卡抵扣', '¥ ' . round($info['card_code_cash'], 2)),
|
|
|
+ array('礼品卡抵扣', $info['card'] . '¥ ' . round($info['card_code_cash'], 2)),
|
|
|
array('钱包抵扣', '¥ ' . round($info['wallet_cash'], 2)),
|
|
|
array('抹零', '¥ ' . round($info['kou_cash'], 2)),
|
|
|
),
|
rabin