From f2b14907f63b4bfdbaa00871a978ff3210091722 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期三, 12 七月 2023 10:15:00 +0800
Subject: [PATCH] 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 | 2 ++
application/behavior/User.php | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/application/api/logic/taoke/device/Dataoke.php b/application/api/logic/taoke/device/Dataoke.php
index 56985ef..6968925 100644
--- a/application/api/logic/taoke/device/Dataoke.php
+++ b/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;
}
diff --git a/application/behavior/User.php b/application/behavior/User.php
index 05f4c68..183581a 100644
--- a/application/behavior/User.php
+++ b/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'] : '',
--
Gitblit v1.9.3