|
@@ -783,9 +783,12 @@ class Manage
|
|
|
}
|
|
|
|
|
|
|
|
|
- public function getGoods($type, $type_id, $sku_id)
|
|
|
+ public function getGoods($type, $type_id, $sku_id, $name = '')
|
|
|
{
|
|
|
if ($type == 1) {
|
|
|
+ if ($name) {
|
|
|
+ return array('name' => $name . '('.$type_id.')');
|
|
|
+ }
|
|
|
if ($sku_id == -2) {
|
|
|
return '商品';
|
|
|
}
|
|
@@ -802,6 +805,9 @@ class Manage
|
|
|
$card = Dever::db('card/info')->find($code['card_id']);
|
|
|
return array('name' => $card['name'] . '('.$type_id.') <br /> ' . $code['card'], 'price' => $code['total_cash']);
|
|
|
} elseif ($type == 3) {
|
|
|
+ if ($name) {
|
|
|
+ return array('name' => $name . '('.$type_id.')');
|
|
|
+ }
|
|
|
$prize = Dever::db('setting/prize')->find($type_id);
|
|
|
|
|
|
return array('name' => $prize['name'] . '('.$type_id.')', 'price' => $prize['price']);
|