|
@@ -7,7 +7,7 @@ use Dever;
|
|
class Set
|
|
class Set
|
|
{
|
|
{
|
|
|
|
|
|
- public function getGoodsList($id, $type, $table)
|
|
+ public function getGoodsList($id, $type, $table, $col = 'goods_id')
|
|
{
|
|
{
|
|
$where['status'] = 1;
|
|
$where['status'] = 1;
|
|
|
|
|
|
@@ -24,7 +24,10 @@ class Set
|
|
$sku = Dever::db('goods/info_sku')->select(array('info_id' => $v['id']));
|
|
$sku = Dever::db('goods/info_sku')->select(array('info_id' => $v['id']));
|
|
|
|
|
|
if ($sku) {
|
|
if ($sku) {
|
|
- $other_where = array($type => $id, 'goods_id' => $v['id'], 'sku_id' => -1);
|
|
+ $other_where = array($type => $id, $col => $v['id'], 'sku_id' => -1);
|
|
|
|
+ if ($col == 'type_id') {
|
|
|
|
+ $other_where['type'] = 1;
|
|
|
|
+ }
|
|
$give = Dever::input('give');
|
|
$give = Dever::input('give');
|
|
if ($give) {
|
|
if ($give) {
|
|
$other_where['give'] = $give;
|
|
$other_where['give'] = $give;
|
|
@@ -93,7 +96,10 @@ class Set
|
|
'del' => 1,
|
|
'del' => 1,
|
|
'end' => true,
|
|
'end' => true,
|
|
);
|
|
);
|
|
- $other_sku_where = array($type => $id, 'goods_id' => $v['id'], 'sku_id' => $v1['id']);
|
|
+ $other_sku_where = array($type => $id, $col => $v['id'], 'sku_id' => $v1['id']);
|
|
|
|
+ if ($col == 'type_id') {
|
|
|
|
+ $other_sku_where['type'] = 1;
|
|
|
|
+ }
|
|
$give = Dever::input('give');
|
|
$give = Dever::input('give');
|
|
if ($give) {
|
|
if ($give) {
|
|
$other_sku_where['give'] = $give;
|
|
$other_sku_where['give'] = $give;
|