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/Parser.php | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/application/api/logic/taoke/Parser.php b/application/api/logic/taoke/Parser.php
index 533c08d..2e90422 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 妫�鏌ユ墍鏈夋帴鍙ｆ槸涓嶆槸鏈夎皟鏁寸殑锛岄渶瑕佷紶浠ｇ悊鐨勭浉搴斿瓧娈�
@@ -47,8 +47,13 @@
$topLevelInfo = $ModelUserLevel->where(['level'=>3])->find();
if(empty($topLevelInfo)) fault('浠ｇ悊閰嶇疆澶辫触');
//鑾峰彇璐拱娆℃暟
- self::$buyCount=0;
- if(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;
}
@@ -90,6 +95,7 @@
'url_type' => "3", //鍟嗗搧璇︽儏,
'isCollect' => 0, //鏄惁鏀惰棌
'topLevelName' => self::$topLevelName, //椤剁骇绛夌骇鍚嶇О
+ 'predictPromotionRate'=>0,//姣斾环琛屼负棰勫垽瀹氫剑閲戯紝闇�瑕佺敤鎴峰妗�-鎷煎澶氫笓鐢�
];
}
--
Gitblit v1.9.3