Procházet zdrojové kódy

feat: NG-80: 商品管理——DP价格支持手动填写设置。

kevin před 1 rokem
rodič
revize
570617eac7
1 změnil soubory, kde provedl 3 přidání a 5 odebrání
  1. 3 5
      common/models/forms/ShopGoodsForm.php

+ 3 - 5
common/models/forms/ShopGoodsForm.php

@@ -219,15 +219,13 @@ class ShopGoodsForm extends Model
             foreach ($this->nature as $item) {
                 // 国家
                 $country = Countries::getById($item['ID']);
-                // 转换美元汇率
-                $productRate = CurrencyConversions::getToUSDRate($country['LOCAL_CURRENCY_ID']);
 
                 $shopGoodsNature = new ShopGoodsNature();
                 $shopGoodsNature->GOODS_ID = $shopGoods->ID;
                 $shopGoodsNature->COUNTRY_ID = $item['ID'];
                 $shopGoodsNature->LOCAL_CURRENCY_ID = $country['LOCAL_CURRENCY_ID'];
-                $shopGoodsNature->SELL_PRICE = $shopGoods->SELL_PRICE_STANDARD * $productRate;
-                $shopGoodsNature->MARKET_PRICE = $item['marketPrice'];
+                $shopGoodsNature->SELL_PRICE = round($item['sellPrice']);
+                $shopGoodsNature->MARKET_PRICE = round($item['marketPrice']);
                 $shopGoodsNature->TAX_RATE = $item['taxRate'];
                 if (!$shopGoodsNature->save()) {
                     $transaction->rollBack();
@@ -291,7 +289,7 @@ class ShopGoodsForm extends Model
                 $shopGoodsNature->GOODS_ID = $model->ID;
                 $shopGoodsNature->COUNTRY_ID = $item['ID'];
                 $shopGoodsNature->LOCAL_CURRENCY_ID = $country['LOCAL_CURRENCY_ID'];
-                $shopGoodsNature->SELL_PRICE = round($model->SELL_PRICE_STANDARD * $productRate);
+                $shopGoodsNature->SELL_PRICE = round($item['sellPrice']);
                 $shopGoodsNature->MARKET_PRICE = round($item['marketPrice']);
                 $shopGoodsNature->TAX_RATE = $item['taxRate'];
                 if (!$shopGoodsNature->save()) {