|
@@ -323,19 +323,17 @@ class Api extends Core
|
|
|
$goods = array_keys($goods);
|
|
$goods = array_keys($goods);
|
|
|
}
|
|
}
|
|
|
# 检测当前商品是否符合该卡的限制
|
|
# 检测当前商品是否符合该卡的限制
|
|
|
- foreach ($data['list'] as $k => $v) {
|
|
|
|
|
- if (!isset($v['cash'])) {
|
|
|
|
|
- $v['cash'] = $v['price'];
|
|
|
|
|
|
|
+ foreach ($data['list'] as $k1 => $v1) {
|
|
|
|
|
+ if (!isset($v1['cash'])) {
|
|
|
|
|
+ $v1['cash'] = $v1['price'];
|
|
|
}
|
|
}
|
|
|
if ($goods) {
|
|
if ($goods) {
|
|
|
- if (in_array($v['id'], $goods)) {
|
|
|
|
|
- $price += ($v['cash'] * $v['num']);
|
|
|
|
|
- $card_goods[] = $v;
|
|
|
|
|
|
|
+ if (in_array($v1['id'], $goods)) {
|
|
|
|
|
+ $price += ($v1['cash'] * $v1['num']);
|
|
|
}
|
|
}
|
|
|
} elseif ($card_info['category']) {
|
|
} elseif ($card_info['category']) {
|
|
|
- if (in_array($v['top_category_id'], $card_info['category'])) {
|
|
|
|
|
- $price += ($v['cash'] * $v['num']);
|
|
|
|
|
- $card_goods[] = $v;
|
|
|
|
|
|
|
+ if (in_array($v1['top_category_id'], $card_info['category'])) {
|
|
|
|
|
+ $price += ($v1['cash'] * $v1['num']);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
rabin