修改结算优惠券

@@ -398,26 +398,40 @@ class Cars extends Api
             $res1 = Common::selectSoftWhereData('goods',['id'=>['in',$goods_id_s],'type'=>$flag[1]],'id,t_id');
             $res1 = Common::selectSoftWhereData('goods',['id'=>['in',$goods_id_s],'type'=>$flag[1]],'id,t_id');
             $b_id_s = array_unique(array_values(array_column($res1,'t_id')));
             $b_id_s = array_unique(array_values(array_column($res1,'t_id')));
 
 
-            //普通商品
-            $where1['bg_id'] = ['in',$goods_id_s];
-            $where1['type'] = $type[2];
-
             $time = time();
             $time = time();
             $where['id'] = ['in',$receive_s];
             $where['id'] = ['in',$receive_s];
             $where['end_time'] = ['>',$time];
             $where['end_time'] = ['>',$time];
 
 
-            //包含品牌中的商品
-            if(!empty($b_id_s)){
-                $where2['bg_id'] = ['in',$b_id_s];
-                $where2['type'] = $type[1];
-                $data = Common::selectWhereOrData('coupon',$where,$where1,$where2,'id,type,coupon_name,c_type,coupon_type,full_reduce,reduce,discount,coupon_number,end_time','sort desc,id desc');
-            }else{
-                $data = Common::selectWhereOrData1('coupon',$where,$where1,'id,type,coupon_name,c_type,coupon_type,full_reduce,reduce,discount,coupon_number,end_time','sort desc,id desc');
-            }
+            $data = Common::selectWhereData('coupon',$where,'id,type,coupon_name,c_type,bg_id,coupon_type,full_reduce,reduce,discount,coupon_number,end_time','sort desc,id desc');
+
             $res = [];
             $res = [];
             $key = 0;
             $key = 0;
             foreach($data as $value){
             foreach($data as $value){
                 $key+=0;
                 $key+=0;
+                $flag = 0;
+                if(!empty($b_id_s)){
+                    //有品牌，看商品所属品牌
+                    if($value['type'] != $type[0]){
+                        $flag = 1;
+                    }else{
+                        if($value['type'] == $type[1] && in_array($value['bg_id'],$b_id_s)){
+                            //去除不是该商品的
+                            $flag = 1;
+                        }
+                    }
+
+                }else{
+                    //无品牌
+                    if($value['type'] == $type[0]){//是全场券
+                        $flag = 1;
+                    }else{
+                        if($value['type'] == $type[2] && in_array($value['bg_id'],$goods_id_s)){
+                            //去除不是该商品的
+                            $flag = 1;
+                        }
+                    }
+                }
+                if($flag == 1){
                     //无门槛，有门槛
                     //无门槛，有门槛
                     if($value['c_type'] == 0){
                     if($value['c_type'] == 0){
                         $res[$key]['id'] = $value['id'];
                         $res[$key]['id'] = $value['id'];
@@ -498,6 +512,7 @@ class Cars extends Api
                         }
                         }
                     }
                     }
                 }
                 }
+            }
 
 
             $this->success('成功',$res);
             $this->success('成功',$res);
         }else{
         }else{

@@ -77,43 +77,6 @@ class Common
      * 查找多条数据
      * 查找多条数据
      * @ApiInternal
      * @ApiInternal
      */
      */
-    public static function selectWhereOrData($table,$where,$where1,$where2,$field,$order='id desc'){
-        $res = Db::name($table)
-            ->where(function(Query $query) use($where,$where1){
-                $query->where($where);
-                $query->where($where1);
-            })
-            ->whereOr(function(Query $query) use($where,$where2){
-                if(!empty($where2)){
-                    $query->where($where);
-                    $query->where($where2);
-                }
-            })
-            ->field($field)
-            ->order($order)
-            ->select();
-        //  SELECT * FROM `ffg_coupon` WHERE  (`id` IN (9,4)  AND `end_time` > 1575427684  AND `bg_id` IN (2)  AND `type` = 2 ) OR (  `id` IN (9,4)  AND `end_time` > 1575427665  AND `bg_id` IN (1)  AND `type` = 1 ) ORDER BY `c_type` ASC,`coupon_type` DESC
-        return $res;
-    }
-
-    /**
-     * 查找多条数据
-     * @ApiInternal
-     */
-    public static function selectWhereOrData1($table,$where,$where1,$field,$order='id desc'){
-        $res = Db::name($table)
-            ->where($where)
-            ->where($where1)
-            ->field($field)
-            ->order($order)
-            ->select();
-        return $res;
-    }
-
-    /**
-     * 查找多条数据
-     * @ApiInternal
-     */
     public static function selectWherePageData($table,$where,$field,$page,$limit='',$order='id desc'){
     public static function selectWherePageData($table,$where,$field,$page,$limit='',$order='id desc'){
         if($limit == ''){
         if($limit == ''){
             $limit = config('verify.limit');
             $limit = config('verify.limit');