Преглед изворни кода

feat: NG-71: 会员奖金计算调整

kevin пре 1 година
родитељ
комит
25da091515
2 измењених фајлова са 5 додато и 15 уклоњено
  1. 4 14
      common/models/DealType.php
  2. 1 1
      common/models/UserPerformance.php

+ 4 - 14
common/models/DealType.php

@@ -113,26 +113,16 @@ class DealType extends \common\components\ActiveRecord
 
     public static function getDealTypeIdByTag($tag)
     {
-        $records = self::getFromCache();
-        foreach ($records as $record) {
-            if ($record['TYPE_NAME'] == $tag) {
-                return $record['ID'];
-            }
-        }
+        $record = self::find()->select('ID,TYPE_NAME,COMMENT')->where('TYPE_NAME=:TYPE_NAME', [':TYPE_NAME' => $tag])->asArray()->one();
 
-        return '';
+        return $record['ID'] ?? '';
     }
 
     public static function getDealTypeTagById($dealTypeId)
     {
-        $records = self::getFromCache();
-        foreach ($records as $id => $record) {
-            if ($dealTypeId == $id) {
-                return $record['TYPE_NAME'];
-            }
-        }
+        $record = self::find()->select('ID,TYPE_NAME,COMMENT')->where('ID=:ID', [':ID' => $dealTypeId])->asArray()->one();
 
-        return '';
+        return $record['TYPE_NAME'] ?? '';
     }
 
     /**

+ 1 - 1
common/models/UserPerformance.php

@@ -218,7 +218,7 @@ class UserPerformance extends \common\components\ActiveRecord
                 'EXPIRED_AT' => date('Y-m-d H:i:s', strtotime('+1 year', time())),
                 'CREATED_AT' => date('Y-m-d H:i:s', time()),
                 'UPDATED_AT' => date('Y-m-d  H:i:s', time()),
-                'REMARK' => DealType::USER_PERFORMANCE_SEND,
+                'REMARK' => DealType::getDealTypeTagById(DealType::USER_PERFORMANCE_SEND),
                 'BOUNTY_PERIOD_NUM' => $bountyPeriodNum,
                 'PAID_PERIOD_NUM' => $periodNum,
             ]);