|
@@ -316,7 +316,13 @@ class Sell
|
|
|
}
|
|
|
if ($goods) {
|
|
|
if (in_array($v['goods_id'], $goods)) {
|
|
|
- $info['card']['goods'][] = $info['goods'][$k]['info'];
|
|
|
+ if ($card_info['category']) {
|
|
|
+ if (in_array($info['goods'][$k]['info']['top_category_id'], $card_info['category'])) {
|
|
|
+ $info['card']['goods'][] = $info['goods'][$k]['info'];
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ $info['card']['goods'][] = $info['goods'][$k]['info'];
|
|
|
+ }
|
|
|
}
|
|
|
} elseif ($card_info['category']) {
|
|
|
if (in_array($info['goods'][$k]['info']['top_category_id'], $card_info['category'])) {
|
|
@@ -578,8 +584,15 @@ class Sell
|
|
|
}
|
|
|
if ($goods) {
|
|
|
if (in_array($v['id'], $goods)) {
|
|
|
- $price += ($v['cash'] * $v['num']);
|
|
|
- $card_goods[] = $v;
|
|
|
+ if ($card_info['category']) {
|
|
|
+ if (in_array($v['top_category_id'], $card_info['category'])) {
|
|
|
+ $price += ($v['cash'] * $v['num']);
|
|
|
+ $card_goods[] = $v;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ $price += ($v['cash'] * $v['num']);
|
|
|
+ $card_goods[] = $v;
|
|
|
+ }
|
|
|
}
|
|
|
} elseif ($card_info['category']) {
|
|
|
if (in_array($v['top_category_id'], $card_info['category'])) {
|