From c1dfbb647c0aac23f9773196a3b4c5a31117d0c2 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期三, 19 七月 2023 13:42:11 +0800
Subject: [PATCH] no message
---
application/api/logic/taoke/device/Dingdanxia.php | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/application/api/logic/taoke/device/Dingdanxia.php b/application/api/logic/taoke/device/Dingdanxia.php
index e9b3dcf..e4ec5f9 100644
--- a/application/api/logic/taoke/device/Dingdanxia.php
+++ b/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;
}
--
Gitblit v1.9.3