Merge branch 'feature/v1.1.4开发' of http://60.204.153.149:8081/r/dfgApi into...

zhaojs

2023-07-12 bde3259b82d691433d3aa230f992be31b65dca2d

Merge branch 'feature/v1.1.4开发' of http://60.204.153.149:8081/r/dfgApi into feature/v1.1.4开发

 application/api/logic/taoke/device/Haodanku.php

@@ -1057,7 +1057,8 @@
        $init_goods['isCollect'] = self::isCollect($init_goods);
        $init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['dyrates']/100);
        $init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['dyrates']/100,self::$topFanliRate);
        
        //新增商品类目ID--byhyt
        $init_goods['cid'] = isset($goods['cate_id']) ? $goods['cate_id'] : '';
        return $init_goods;
    }

@@ -1090,7 +1091,8 @@
        $init_goods['isCollect'] = self::isCollect($init_goods);
        $init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['dyrates']/100);
        $init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['dyrates']/100,self::$topFanliRate);
        
        //新增商品类目ID--byhyt
        $init_goods['cid'] = isset($goods['cate_id']) ? $goods['cate_id'] : '';
        return $init_goods;
    }

@@ -1156,7 +1158,8 @@
        $init_goods['isCollect'] = self::isCollect($init_goods);
        $init_goods['fanli'] =isset($goods['itemendprice']) ? $goods['itemendprice'] : 0;
        $init_goods['topFanli'] =0;
        
        //新增商品类目ID--byhyt
        $init_goods['cid'] = isset($goods['cate_id']) ? $goods['cate_id'] : '';
        return $init_goods;
    }


 application/api/logic/taoke/device/Pdd.php

@@ -442,6 +442,8 @@
        $init_goods['isCollect'] = self::isCollect($init_goods);
        $init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['promotion_rate']/1000);
        $init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['promotion_rate']/1000,self::$topFanliRate);
        //新增商品类目ID--byhyt
        $init_goods['cid'] = isset($goods['cat_ids'][0]) ? $goods['cat_ids'][0] : '';
        return $init_goods;
    }