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

zhaojs

2023-07-12 f2b14907f63b4bfdbaa00871a978ff3210091722

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/Dataoke.php

@@ -983,6 +983,8 @@
        $init_goods['fanli'] = self::rebate($goods['actualPrice'],$goods['commissionRate']/100);
        $init_goods['topFanli'] = self::rebate($goods['actualPrice'],$goods['commissionRate']/100,self::$topFanliRate);
        $init_goods['isCollect'] = self::isCollect($init_goods);
        //补充返回值商品类目
        $init_goods['cid'] = isset($goods['cid']) ? $goods['cid'] : '';
        return $init_goods;
    }
    

 application/behavior/User.php

@@ -20,6 +20,7 @@
            'user_id' => $event['user_id'],
            'goodsId' => $event['goodsId'],
            'goods_sign' => isset($event['goods_sign']) ? $event['goods_sign'] : '',
            'cid'=>isset($event['cid']) ? $event['cid'] : '',
            'sourceType' => isset($event['sourceType']) ? $event['sourceType'] : '',
            'faction' => isset($event['faction']) ? $event['faction'] : '',
            'title' => isset($event['title']) ? $event['title'] : '',