Merge branch 'release/v1.1.3api发布'

zhaojs

2023-06-29 c6aed7b39a4e95a25e5bcac47a55ac98cb222b49

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

@@ -117,6 +117,9 @@
        $list = $result['data'];
        if(!empty($list)){
            foreach($list as &$goods){
                 $marektprice=isset($goods['marketPrice']) ? (float)$goods['marketPrice'] : 0;
                $vipprice=isset($goods['vipPrice']) ? (float)$goods['vipPrice'] : 0;
               $goods["discount"]=$marektprice==0?0:number_format(($vipprice/$marektprice)*10,1);
                $goods = self::initGoods($goods,'wph','w');
            }
        }
@@ -409,8 +412,8 @@
        $init_goods['faction'] = $faction;
        $init_goods['isCollect'] = self::isCollect($init_goods);
        $init_goods['labelImg'] = self::initSourse($init_goods['sourceType']);
        $init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['commissionRate']);
        $init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['commissionRate'],self::$topFanliRate);
        $init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['commissionRate']/100);
        $init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['commissionRate']/100,self::$topFanliRate);
        return $init_goods;
    }

@@ -452,8 +455,8 @@
        $init_goods['faction'] = $faction;
        $init_goods['labelImg'] = self::initSourse($init_goods['sourceType']);
        $init_goods['isCollect'] = self::isCollect($init_goods);
        $init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['commissionRate']);
        $init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['commissionRate'],self::$topFanliRate);
        $init_goods['fanli'] = self::rebate($init_goods["actualPrice"],$goods['commissionRate']/100);
        $init_goods['topFanli'] = self::rebate($init_goods['actualPrice'],$goods['commissionRate']/100,self::$topFanliRate);
        return $init_goods;
    }