root 3 gadi atpakaļ
vecāks
revīzija
0928427884

+ 7 - 7
common/helpers/bonus/CalcCache.php

@@ -34,7 +34,7 @@ class CalcCache {
     const REDIS_KEY_PREFIX_USER = 'calc:user_';
     const REDIS_KEY_PREFIX_USER_ACTIVE = 'calc:userActive_';
     const REDIS_KEY_PREFIX_USER_INFO = 'calc:userInfo_';
-    const REDIS_KEY_PREFIX_USER_NETWORK_INFO = 'calc:userNetWork_';
+    const REDIS_KEY_PREFIX_USER_RELATION_INFO = 'calc:userRelationInfo_';
     const REDIS_KEY_PREFIX_USER_BONUS = 'calc:userBonus_';
     const REDIS_KEY_PREFIX_PERIOD_MONTH_CALC_BONUS = 'calc:periodMonthCalcBonus_';
     const REDIS_KEY_PREFIX_USER_PERF = 'calc:userPerf_';
@@ -745,20 +745,20 @@ class CalcCache {
     }
 
     /**
-     * 获取会员networknew表数据,根据用户id
+     * 根据用户id,获取会员小组上级
      */
-    public static function getUserNetWorkNewInfo($userId, $periodNum) {
-        $key = self::REDIS_KEY_PREFIX_USER_NETWORK_INFO . $periodNum;
+    public static function getUserRelationInfo($userId, $periodNum) {
+        $key = self::REDIS_KEY_PREFIX_USER_RELATION_INFO . $periodNum;
         $data = Yii::$app->redis->hget($key, $userId);
         if (!$data) {
-            $netWork = UserNetwork::findUseDbCalc()
+            $relation = UserRelation::findUseDbCalc()
             ->select('USER_ID,PARENT_UID')
             ->where('USER_ID=:USER_ID', [':USER_ID' => $userId])
             ->asArray()
             ->one();
-            $data = Json::encode($netWork);
+            $data = Json::encode($relation);
             Yii::$app->redis->hset($key, $userId, $data);
-            unset($netWork, $key, $userId, $periodNum);
+            unset($relation, $key, $userId, $periodNum);
         }
 
         return $data ? Json::decode($data, true) : [];

+ 4 - 4
common/helpers/bonus/PerfCalc.php

@@ -1201,7 +1201,7 @@ class PerfCalc {
                 $userId = $everyData['USER_ID'];
                 $pv = $everyData['MONTH_PV'];
                 $userBaseInfo = CalcCache::getUserInfo($userId, $this->_periodNum);
-                $userNetWork = CalcCache::getUserNetWorkNewInfo($userId, $this->_periodNum);
+                $userRelation = CalcCache::getUserRelationInfo($userId, $this->_periodNum);
                 // 记录有业绩单的用户
                 StorePerfLog::addOrUpdate(
                     $this->_periodNum, 
@@ -1214,7 +1214,7 @@ class PerfCalc {
                         'PERIOD_NUM' => $this->_periodNum,
                         'CALC_MONTH' => $this->_calcYearMonth,
                         'CREATE_AT' => time(),
-                        'PARENT_UID' => $userNetWork['PARENT_UID']
+                        'PARENT_UID' => $userRelation['PARENT_UID']
                     ],
                     $pv
                 );
@@ -1228,7 +1228,7 @@ class PerfCalc {
                     // 如果此用户不是店铺,继续上找到店铺并累加上去PV
                     $this->loopRelationParentDo($userId, function ($parent) use (&$everyData) {
                         $parentUser = CalcCache::getUserInfo($parent['PARENT_UID'], $this->_periodNum);
-                        $userNetWork = CalcCache::getUserNetWorkNewInfo($parent['PARENT_UID'], $this->_periodNum);
+                        $userRelation = CalcCache::getUserRelationInfo($parent['PARENT_UID'], $this->_periodNum);
                         $isStudio = $parentUser['IS_STUDIO'] == 1 ? true : false;
                         $appendPv = $isStudio ? $everyData['MONTH_PV'] : 0;
                         StorePerfLog::addOrUpdate(
@@ -1242,7 +1242,7 @@ class PerfCalc {
                                 'PERIOD_NUM' => $this->_periodNum,
                                 'CALC_MONTH' => $this->_calcYearMonth,
                                 'CREATE_AT' => time(),
-                                'PARENT_UID' => $userNetWork['PARENT_UID']
+                                'PARENT_UID' => $userRelation['PARENT_UID']
                             ],
                             $appendPv
                         );