rabin 2 rokov pred
rodič
commit
0088f3aee0
2 zmenil súbory, kde vykonal 5 pridanie a 24 odobranie
  1. 2 8
      app/card/src/Api.php
  2. 3 16
      app/shop/lib/Sell.php

+ 2 - 8
app/card/src/Api.php

@@ -383,17 +383,11 @@ class Api extends Core
                             }
                             if ($goods) {
                                 if (in_array($v1['id'], $goods)) {
-                                    if ($v['info']['category']) {
-                                        if (in_array($v1['top_category_id'], $v['info']['category'])) {
-                                            $price += ($v1['cash'] * $v1['num']);
-                                        }
-                                    } else {
-                                        $price += ($v1['cash'] * $v1['num']);
-                                    }
+                                    $price += ($v1['cash'] * $v1['buy_num']);
                                 }
                             } elseif ($v['info']['category']) {
                                 if (in_array($v1['top_category_id'], $v['info']['category'])) {
-                                    $price += ($v1['cash'] * $v1['num']);
+                                    $price += ($v1['cash'] * $v1['buy_num']);
                                 }
                             }
                         }

+ 3 - 16
app/shop/lib/Sell.php

@@ -334,13 +334,7 @@ class Sell
                 if ($check) {
                     if ($goods) {
                         if (in_array($v['goods_id'], $goods)) {
-                            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'];
-                            }
+                            $info['card']['goods'][] = $info['goods'][$k]['info'];
                         }
                     } elseif ($card_info['category']) {
                         if (in_array($info['goods'][$k]['info']['top_category_id'], $card_info['category'])) {
@@ -642,15 +636,8 @@ 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'])) {
-                                                    $price += ($v['cash'] * $v['num']);
-                                                    $card_goods[] = $v;
-                                                }
-                                            } else {
-                                                $price += ($v['cash'] * $v['num']);
-                                                $card_goods[] = $v;
-                                            }
+                                            $price += ($v['cash'] * $v['num']);
+                                            $card_goods[] = $v;
                                         }
                                     } elseif ($card_code['info']['category']) {
                                         if (in_array($v['top_category_id'], $card_code['info']['category'])) {