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

common/models/forms/ApproachDeclarationForm.php

@@ -681,14 +681,14 @@ class ApproachDeclarationForm extends Model
                                     throw new Exception(Yii::t('app', 'productsDoesSoldOut'));
                                 }
 
-                                $totalAmount += $goodsNature['SELL_PRICE'] * intval($v);
+                                $totalAmount += $goodsNature['MARKET_PRICE'] * intval($v);
                                 $totalAmountStandard += $goods['SELL_PRICE_STANDARD'] * intval($v);
                                 $realPriceStandard = $goods['SELL_PRICE_STANDARD'];
                                 $totalPv += $goods['PRICE_PV'] * intval($v);
                                 $this->_orderGoods[] = [
                                     'GOODS_ID' => $goods['ID'],
-                                    'PRICE' => $goodsNature['SELL_PRICE'],
-                                    'REAL_PRICE' => $goodsNature['SELL_PRICE'],
+                                    'PRICE' => $goodsNature['MARKET_PRICE'],
+                                    'REAL_PRICE' => $goodsNature['MARKET_PRICE'],
                                     'PV' => $goods['PRICE_PV'],
                                     'REAL_PV' => $goods['PRICE_PV'],
                                     'POINT' => $goods['POINT'],

common/models/forms/DeclarationForm.php

@@ -709,14 +709,14 @@ class DeclarationForm extends Model
                                 throw new Exception(Yii::t('app', 'productsDoesSoldOut'));
                             }
 
-                            $totalAmount += $goodsNature['SELL_PRICE'] * intval($v);
+                            $totalAmount += $goodsNature['MARKET_PRICE'] * intval($v);
                             $totalAmountStandard += $goods['SELL_PRICE_STANDARD'] * intval($v);
                             $realPriceStandard = $goods['SELL_PRICE_STANDARD'];
                             $totalPv += $goods['PRICE_PV'] * intval($v);
                             $this->_orderGoods[] = [
                                 'GOODS_ID' => $goods['ID'],
-                                'PRICE' => $goodsNature['SELL_PRICE'],
-                                'REAL_PRICE' => $goodsNature['SELL_PRICE'],
+                                'PRICE' => $goodsNature['MARKET_PRICE'],
+                                'REAL_PRICE' => $goodsNature['MARKET_PRICE'],
                                 'PV' => $goods['PRICE_PV'],
                                 'REAL_PV' => $goods['PRICE_PV'],
                                 'POINT' => $goods['POINT'],