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

frontendApi/modules/v1/controllers/ShopController.php

@@ -633,12 +633,12 @@ class ShopController extends BaseController {
             return static::notice(Yii::t('app', 'memberDoesNotExist'), 400);
         }
 
-        $condition = ' AND STATUS=1 AND (FIND_IN_SET(2,GIFT_TYPE)>0 OR FIND_IN_SET(4,GIFT_TYPE)>0)';
-        $data = ShopGoods::lists($condition, [], [
+        $condition = ' AND STATUS=1 AND (FIND_IN_SET(2,GIFT_TYPE)>0 OR FIND_IN_SET(4,GIFT_TYPE)>0) AND AND N.COUNTRY_ID=:COUNTRY_ID';
+        $data = ShopGoods::lists($condition, [':COUNTRY_ID' => $user['COUNTRY_ID']], [
             'select' => 'S.*,N.MARKET_PRICE,N.SELL_PRICE,N.TAX_RATE,N.LOCAL_CURRENCY_ID,N.COUNTRY_ID',
             'from' => ShopGoods::tableName() . ' AS S',
             'join' => [
-                ['INNER JOIN', ShopGoodsNature::tableName() . ' AS N', 'N.GOODS_ID = S.ID AND N.COUNTRY_ID = ' . $user['COUNTRY_ID']],
+                ['INNER JOIN', ShopGoodsNature::tableName() . ' AS N', 'N.GOODS_ID = S.ID'],
             ],
             'orderBy' => 'SORT ASC,CREATED_AT DESC',
         ]);