1

application/api/controller/Subscribe.php

@@ -65,7 +65,6 @@ class Subscribe extends Base
                     $cate_two_id = Db::name('goods_cate')->getLastInsID(array('title'=>$v[1],'level'=>2,'pid'=>$cate_one_id));
                 }
                 $goods_id = Db::name('store_goods')->where('name',$v[4])->value('id');
-                $specification = $v[5].'::'.$v[6];
                 if(empty($old_cate_one_id) || empty($old_cate_two_id) || empty($goods_id)){
                     $goods_id = Db::name('store_goods')->getLastInsID(
                         array(
@@ -77,11 +76,19 @@ class Subscribe extends Base
                         )
                     );
                 }
-                $goods_item_id = Db::name('store_goods_item')->where('goods_id',$goods_id)->where('goods_spec',$specification)->value('id');
-                if(empty($goods_item_id)){
-                    $goods_item_id = Db::name('store_goods_item')->getLastInsID(array('goods_id'=>$goods_id, 'goods_spec'=>$specification, 'goods_no'=>$v[0]));
+                $specification_name_arr = explode(',',$v[5]);
+                $specification_value_arr = explode(',',$v[6]);
+                if(count($specification_name_arr) != count($specification_value_arr)){
+                    $this->error('规格信息有误');
+                }
+                foreach ($specification_name_arr as $sk=>$sv){
+                    $specification = $sv.'::'.$specification_value_arr[$sk];
+                    $goods_item_id = Db::name('store_goods_item')->where('goods_id',$goods_id)->where('goods_spec',$specification)->value('id');
+                    if(empty($goods_item_id)){
+                        $goods_item_id = Db::name('store_goods_item')->getLastInsID(array('goods_id'=>$goods_id, 'goods_spec'=>$specification, 'goods_no'=>$v[0]));
+                    }
+                    $data[] = array('name'=>$v[4],'specification'=>$sv.';'.$specification_value_arr[$sk],'num'=>$v[7],'price'=>$v[8],'goods_item_id'=>$goods_item_id);
                 }
-                $data[] = array('name'=>$v[4],'specification'=>$v[5].';'.$v[6],'num'=>$v[7],'price'=>$v[8],'goods_item_id'=>$goods_item_id);
             }
         }
         $this->success('导入成功',$data);