edit

app/card/src/Api.php

@@ -332,10 +332,18 @@ class Api extends Core
                 # 验证是否符合当前商品
                 $card_goods = array();
                 $check = false;
-                $goods = Dever::db('card/info_goods')->getData(array('card_id' => $v['info']['id']));
-                if ($goods || $v['info']['category']) {
-                    $check = true;
+                $xian = false;
+                if ($this->shop['type'] == 1 && $v['info']['shop_set'] == 1) {
+                    $check = false;
+                    $xian = false;
+                } else {
+                    $xian = true;
+                    $goods = Dever::db('card/info_goods')->getData(array('card_id' => $v['info']['id']));
+                    if ($goods || $v['info']['category']) {
+                        $check = true;
+                    }
                 }
+                
                 $v['minfo'] = '';
                 $v['cinfo'] = '';
 
@@ -371,7 +379,7 @@ class Api extends Core
                     $price = $data['price'];
                 }
 
-                if ($v['info']['min'] > 0 && $price < $v['info']['min']) {
+                if ($xian && $v['info']['min'] > 0 && $price < $v['info']['min']) {
                     # 不满足限额 不可用
                     $no = true;
                 } else {

app/shop/lib/Sell.php

@@ -297,12 +297,17 @@ class Sell
         }
         if ($this->view == 2) {
             $check = false;
-            if (isset($card_info) && $card_info) {
+            if (isset($card_info) && $card_info && ) {
                 $info['card']['goods'] = array();
                 $check = false;
-                $goods = Dever::db('card/info_goods')->getData(array('card_id' => $card_info['id']));
-                if ($goods || $card_info['category']) {
-                    $check = true;
+                $shop = Dever::db('shop/info')->find($info['shop_id']);
+                if ($shop['type'] == 1 && $card_info['shop_set'] == 1) {
+                    $check = false;
+                } else {
+                    $goods = Dever::db('card/info_goods')->getData(array('card_id' => $card_info['id']));
+                    if ($goods || $card_info['category']) {
+                        $check = true;
+                    }
                 }
             }
             foreach ($info['goods'] as $k => $v) {
@@ -566,9 +571,16 @@ class Sell
                     if ($card_cash > 0) {
                         $card_goods = array();
                         $check = false;
-                        $goods = Dever::db('card/info_goods')->getData(array('card_id' => $card_info['id']));
-                        if ($goods || $card_info['category']) {
-                            $check = true;
+                        $xian = false;
+                        if ($data['shop']['type'] == 1 && $card_info['shop_set'] == 1) {
+                            $check = false;
+                            $xian = false;
+                        } else {
+                            $xian = true;
+                            $goods = Dever::db('card/info_goods')->getData(array('card_id' => $card_info['id']));
+                            if ($goods || $card_info['category']) {
+                                $check = true;
+                            }
                         }
 
                         if ($check) {
@@ -605,7 +617,7 @@ class Sell
                             $price = $data['price'];
                         }
 
-                        if ($card_info['min'] > 0 && $price < $card_info['min']) {
+                        if ($xian && $card_info['min'] > 0 && $price < $card_info['min']) {
                             # 不满足限额
                         } else {
                             $data['card'] = array();