feat: NG-15: 新会员注册时增加国家与语言选项.

common/models/Currency.php

@@ -17,6 +17,8 @@ use Yii;
  */
 class Currency extends \common\components\ActiveRecord
 {
+    const USD = 149;
+
     /**
      * @inheritdoc
      */

common/models/CurrencyConversions.php

@@ -145,17 +145,16 @@ class CurrencyConversions extends \common\components\ActiveRecord
     {
         $data = self::findOneAsArray('FROM_CURRENCY_ID=:FROM_CURRENCY_ID AND TO_CURRENCY_ID=:TO_CURRENCY_ID AND ACTIVE=1',
             [
-                ':FROM_CURRENCY_ID' => 149, // 美元汇率
+                ':FROM_CURRENCY_ID' => Currency::USD,
                 ':TO_CURRENCY_ID' => $toCurrencyId,
             ]);
 
         return $rateType == 'product' ? ($data['PRODUCT_RATE'] ?? 0.0) : ($data['BONUSES_RATE'] ?? 0.0);
     }
 
-    public static function updateOne(int $fromCurrencyId, int $toCurrencyId): bool
+    public static function deleteOne(int $fromCurrencyId, int $toCurrencyId): bool
     {
-        return self::updateAll(['ACTIVE' => \StatusEnum::INACTIVE],
-            'FROM_CURRENCY_ID=:FROM_CURRENCY_ID AND TO_CURRENCY_ID=:TO_CURRENCY_ID AND ACTIVE=1',
+        return self::deleteAll('FROM_CURRENCY_ID=:FROM_CURRENCY_ID AND TO_CURRENCY_ID=:TO_CURRENCY_ID',
             [
                 ':FROM_CURRENCY_ID' => $fromCurrencyId,
                 ':TO_CURRENCY_ID' => $toCurrencyId,

common/models/forms/CurrenciesConversionsForm.php

@@ -8,6 +8,7 @@ use common\helpers\Form;
 use common\helpers\LoggerTool;
 use common\helpers\snowflake\PageSnowFake;
 use common\libs\logging\operate\AdminOperate;
+use common\models\Currency;
 use common\models\CurrencyConversions;
 use common\models\Period;
 use common\models\ShopGoods;
@@ -21,7 +22,7 @@ class CurrenciesConversionsForm extends Model
 {
     public $modelClass = CurrencyConversions::class;
 
-    public $from_currency_id = 149; // 美元USD
+    public $from_currency_id = Currency::USD; // 美元USD
     public $to_currency_id;
     public $product_rate;
     public $bonuses_rate;
@@ -89,7 +90,7 @@ class CurrenciesConversionsForm extends Model
         $transaction = \Yii::$app->db->beginTransaction();
         try {
             // 删除原记录
-            $this->modelClass::updateOne($this->from_currency_id, $this->to_currency_id);
+            $this->modelClass::deleteOne($this->from_currency_id, $this->to_currency_id);
             // 添加新数据
             $model = new CurrencyConversions();
             $model->ID = PageSnowFake::instance()->generateId();