From 6bf09b5ad960fd4e657c132f9e451c487aa4d9c7 Mon Sep 17 00:00:00 2001
From: zhaojs <349234519@qq.com>
Date: 星期三, 02 八月 2023 10:00:31 +0800
Subject: [PATCH] Merge branch 'feature/v1.1.5接口补充2' into develop
---
application/api/logic/taoke/Parser.php | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/application/api/logic/taoke/Parser.php b/application/api/logic/taoke/Parser.php
index 801011b..a1d519f 100644
--- a/application/api/logic/taoke/Parser.php
+++ b/application/api/logic/taoke/Parser.php
@@ -7,7 +7,7 @@
use app\api\logic\UserCollect;
use app\api\logic\User as LogicUser;
use app\common\model\UserLevel as ModelUserLevel;
-
+use \app\common\model\UserExtend as ModelUserExtend;
class Parser extends BasicLogic
{
//TODO 妫�鏌ユ墍鏈夋帴鍙ｆ槸涓嶆槸鏈夎皟鏁寸殑锛岄渶瑕佷紶浠ｇ悊鐨勭浉搴斿瓧娈�
@@ -28,7 +28,7 @@
protected static $buyCount=-1;//璐拱娆℃暟
- protected static $returnLimit=-2;//浣ｉ噾鍏ㄨ繑鐨勮喘涔版鏁伴檺鍒�
+ protected static $returnLimit=1;//浣ｉ噾鍏ㄨ繑鐨勮喘涔版鏁伴檺鍒�
public function __construct(){
@@ -47,11 +47,16 @@
$topLevelInfo = $ModelUserLevel->where(['level'=>3])->find();
if(empty($topLevelInfo)) fault('浠ｇ悊閰嶇疆澶辫触');
//鑾峰彇璐拱娆℃暟
- //self::$buyCount=0;
- if(self::$buyCount>0&&self::$buyCount<=self::$returnLimit)
+ /* $ModelUserExtend=new ModelUserExtend();
+ $userBuy= $ModelUserExtend->where(['id'=>USERID])->find();
+ if(!empty($userBuy))
+ {
+ self::$buyCount=$userBuy['tradecount'];
+ }
+ if(self::$buyCount>=0&&self::$buyCount<self::$returnLimit)
{//绗﹀悎鍏ㄨ繑瑙勫垯
self::$userRate =1;
- }
+ } */
self::$topFanliRate = $topLevelInfo['own_commission_rate'] * 0.01;
self::$topLevelName = $topLevelInfo['level_name'];
}
@@ -90,6 +95,7 @@
'url_type' => "3", //鍟嗗搧璇︽儏,
'isCollect' => 0, //鏄惁鏀惰棌
'topLevelName' => self::$topLevelName, //椤剁骇绛夌骇鍚嶇О
+ 'predictPromotionRate'=>0,//姣斾环琛屼负棰勫垽瀹氫剑閲戯紝闇�瑕佺敤鎴峰妗�-鎷煎澶氫笓鐢�
];
}
--
Gitblit v1.9.3