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

frontendApi/modules/v1/controllers/ShopController.php

@@ -71,6 +71,7 @@ class ShopController extends BaseController {
         }
         $condition .= ") AND S.CATEGORY_TYPE = :CATEGORY_TYPE";
         $params[':CATEGORY_TYPE'] = intval($categoryType);
+        $params[':COUNTRY_ID'] = $user['COUNTRY_ID'];
 
         $userId = \Yii::$app->user->id;
         // 分期的总期数
@@ -88,9 +89,8 @@ class ShopController extends BaseController {
                 $condition .= " AND (INSTALMENT = 0 OR INSTALMENT=1)";
             }
         }
-        $condition .= ' AND N.COUNTRY_ID = ' . $user['COUNTRY_ID'];
+        $condition .= ' AND N.COUNTRY_ID=:COUNTRY_ID ';
 
-        LoggerTool::info(json_encode([$condition, $params]));
         $data = ShopGoods::lists($condition, $params, [
             'select' => 'S.*,N.MARKET_PRICE,N.SELL_PRICE,N.TAX_RATE,N.LOCAL_CURRENCY_ID,N.COUNTRY_ID',
             'from' => ShopGoods::tableName() . ' AS S',

frontendApi/modules/v1/controllers/UserController.php

@@ -421,13 +421,13 @@ class UserController extends BaseController {
             $query_condition .= " OR FIND_IN_SET(3, S.GIFT_TYPE)>0";
         }
 
-        $query_condition .= $condition . ' AND N.COUNTRY_ID = ' . $user['COUNTRY_ID'];
+        $query_condition .= $condition . ' AND N.COUNTRY_ID=:COUNTRY_ID ';
 
         $allGoods = ShopGoods::find()
             ->alias('S')
             ->select('S.*,N.MARKET_PRICE,N.SELL_PRICE,N.TAX_RATE,N.LOCAL_CURRENCY_ID,N.COUNTRY_ID')
             ->join('LEFT JOIN', ShopGoodsNature::tableName() . ' AS N', 'N.GOODS_ID=S.ID')
-            ->where("STATUS=1 AND CATEGORY_TYPE=1 " . $query_condition)
+            ->where("STATUS=1 AND CATEGORY_TYPE=1 " . $query_condition, [':COUNTRY_ID' => $user['COUNTRY_ID']])
             ->orderBy('SORT ASC')
             ->asArray()
             ->all();
@@ -566,16 +566,14 @@ class UserController extends BaseController {
         if($isStudio==1){
             $query_condition .= " OR FIND_IN_SET(3, S.GIFT_TYPE)>0";
         }
-        $query_condition .= ") AND (S.INSTALMENT=0 OR S.INSTALMENT=1) AND N.COUNTRY_ID=" . $countryId;
-
-        LoggerTool::info(json_encode(["STATUS=1 AND CATEGORY_TYPE=1 " . $query_condition]));
+        $query_condition .= ") AND (S.INSTALMENT=0 OR S.INSTALMENT=1) AND N.COUNTRY_ID=:COUNTRY_ID";
 
         // 只查询普通商品
         $allGoods = ShopGoods::find()
             ->alias('S')
             ->select('S.*,N.MARKET_PRICE,N.SELL_PRICE,N.TAX_RATE,N.LOCAL_CURRENCY_ID,N.COUNTRY_ID')
             ->join('INNER JOIN', ShopGoodsNature::tableName() . ' AS N', 'N.GOODS_ID=S.ID')
-            ->where("STATUS=1 AND CATEGORY_TYPE=1 " . $query_condition)
+            ->where("STATUS=1 AND CATEGORY_TYPE=1 " . $query_condition, [':COUNTRY_ID' => $countryId])
             ->orderBy('SORT ASC')
             ->asArray()
             ->all();