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

common/models/forms/ShopGoodsForm.php

@@ -218,8 +218,8 @@ class ShopGoodsForm extends Model
                 $shopGoodsNature->GOODS_ID = $shopGoods->ID;
                 $shopGoodsNature->COUNTRY_ID = $item['ID'];
                 $shopGoodsNature->LOCAL_CURRENCY_ID = $country['LOCAL_CURRENCY_ID'];
-                $shopGoodsNature->MARKET_PRICE = $shopGoods->SELL_PRICE_STANDARD * $productRate;
-                $shopGoodsNature->SELL_PRICE = $item['sellPrice'];
+                $shopGoodsNature->MARKET_PRICE = $item['marketPrice']; //$shopGoods->SELL_PRICE_STANDARD * $productRate;
+                $shopGoodsNature->SELL_PRICE = $shopGoods->SELL_PRICE_STANDARD * $productRate; // $item['sellPrice'];
                 $shopGoodsNature->TAX_RATE = $item['taxRate'];
                 if (!$shopGoodsNature->save()) {
                     $transaction->rollBack();
@@ -283,8 +283,8 @@ class ShopGoodsForm extends Model
                 $shopGoodsNature->GOODS_ID = $model->ID;
                 $shopGoodsNature->COUNTRY_ID = $item['ID'];
                 $shopGoodsNature->LOCAL_CURRENCY_ID = $country['LOCAL_CURRENCY_ID'];
-                $shopGoodsNature->MARKET_PRICE = $model->SELL_PRICE_STANDARD * $productRate;
-                $shopGoodsNature->SELL_PRICE = $item['sellPrice'];
+                $shopGoodsNature->MARKET_PRICE = $item['marketPrice']; // $model->SELL_PRICE_STANDARD * $productRate;
+                $shopGoodsNature->SELL_PRICE = $model->SELL_PRICE_STANDARD * $productRate; // $item['sellPrice'];
                 $shopGoodsNature->TAX_RATE = $item['taxRate'];
                 if (!$shopGoodsNature->save()) {
                     $transaction->rollBack();