From bde3259b82d691433d3aa230f992be31b65dca2d Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期三, 12 七月 2023 11:35:18 +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/Pdd.php | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/application/api/logic/taoke/device/Pdd.php b/application/api/logic/taoke/device/Pdd.php
index a6da054..b7439e8 100644
--- a/application/api/logic/taoke/device/Pdd.php
+++ b/application/api/logic/taoke/device/Pdd.php
@@ -357,7 +357,13 @@
if(isset($goods['goods_id']) && isset($goods['goods_name'])){
$goods = self::initGoods($goods);
array_push($tmp,$goods);
- }else{
+ }
+ else if (isset($goods['goods_id']) && isset($goods['goods_sign']))
+ {
+ $goods= self::getGoodsDetail($goods['goods_sign'],false);
+ //array_push($tmp,$goods);
+ }
+ else{
$list = [];
break;
}
@@ -421,6 +427,7 @@
$init_goods['shopLogo'] = isset($goods['mall_img_url']) ? $goods['mall_img_url'] : '';
$init_goods['sourceType'] = "pdd";
$init_goods['faction'] = "p";
+ $init_goods['predictPromotionRate']= isset($goods['predict_promotion_rate']) ? $goods['predict_promotion_rate'] : 1;
$init_goods['desc'] = isset($goods['goods_desc']) ? $goods['goods_desc'] : ''; //鎺ㄥ箍鏂囨
$init_goods['imgs'] = $init_goods['detailPics'] = isset($goods['goods_gallery_urls']) ? $goods['goods_gallery_urls'] : ''; //杞挱鍥�
$init_goods['video'] = isset($goods['video_url']) ? $goods['video_url'] : ''; //瑙嗛
@@ -435,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;
}
--
Gitblit v1.9.3