|
|
@@ -579,7 +579,7 @@ class Sell
|
|
|
$xian = false;
|
|
|
} else {
|
|
|
$xian = true;
|
|
|
- $goods = Dever::db('card/info_goods')->getData(array('card_id' => $card_code['info'['id']));
|
|
|
+ $goods = Dever::db('card/info_goods')->getData(array('card_id' => $card_code['info']['id']));
|
|
|
if ($goods || $card_code['info'['category']) {
|
|
|
$check = true;
|
|
|
}
|
|
|
@@ -587,7 +587,7 @@ class Sell
|
|
|
|
|
|
if ($check) {
|
|
|
$price = 0;
|
|
|
- $card_code['info'['category'] = explode(',', $card_code['info'['category']);
|
|
|
+ $card_code['info'['category'] = explode(',', $card_code['info']['category']);
|
|
|
if ($goods) {
|
|
|
$goods = array_keys($goods);
|
|
|
}
|
|
|
@@ -599,7 +599,7 @@ class Sell
|
|
|
if ($goods) {
|
|
|
if (in_array($v['id'], $goods)) {
|
|
|
if ($card_code['info'['category']) {
|
|
|
- if (in_array($v['top_category_id'], $card_code['info'['category'])) {
|
|
|
+ if (in_array($v['top_category_id'], $card_code['info']['category'])) {
|
|
|
$price += ($v['cash'] * $v['num']);
|
|
|
$card_goods[] = $v;
|
|
|
}
|
|
|
@@ -609,7 +609,7 @@ class Sell
|
|
|
}
|
|
|
}
|
|
|
} elseif ($card_code['info'['category']) {
|
|
|
- if (in_array($v['top_category_id'], $card_code['info'['category'])) {
|
|
|
+ if (in_array($v['top_category_id'], $card_code['info']['category'])) {
|
|
|
$price += ($v['cash'] * $v['num']);
|
|
|
$card_goods[] = $v;
|
|
|
}
|
|
|
@@ -627,18 +627,18 @@ class Sell
|
|
|
$data['price'] -= $data['card']['cash'];
|
|
|
}
|
|
|
|
|
|
- if ($xian && ($price <= 0 || ($card_code['info'['min'] > 0 && $price < $card_code['info'['min']))) {
|
|
|
+ if ($xian && ($price <= 0 || ($card_code['info']['min'] > 0 && $price < $card_code['info']['min']))) {
|
|
|
|
|
|
unset($data['card']);
|
|
|
} else {
|
|
|
- $data['card']['info'] = $card_code['info';
|
|
|
+ $data['card']['info'] = $card_code['info'];
|
|
|
$data['card']['goods'] = $card_goods;
|
|
|
$data['card']['id'] = $card_code['id'];
|
|
|
$data['card']['card'] = $card_code['card'];
|
|
|
|
|
|
$data['card']['cash'] = round($data['card']['cash'], 2);
|
|
|
$config = Dever::db('main/sell_config')->find();
|
|
|
- $card_type = Dever::db('card/type')->find($card_code['info'['type_id']);
|
|
|
+ $card_type = Dever::db('card/type')->find($card_code['info']['type_id']);
|
|
|
$data['card']['name'] = $config['card_name'];
|
|
|
$card = substr($card_code['card'], -4);
|
|
|
$data['card']['name'] .= '（'.$card_type['name'].$card.'）';
|
rabin