|
|
@@ -508,7 +508,7 @@ class UserController extends BaseController {
|
|
|
$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 AND N.COUNTRY_ID = ' . $countyId)
|
|
|
+ ->join('INNER JOIN', ShopGoodsNature::tableName() . ' AS N', 'N.GOODS_ID=S.ID AND N.COUNTRY_ID = ' . $countryId)
|
|
|
->where("STATUS=1 AND CATEGORY_TYPE=1 " . $query_condition)
|
|
|
->orderBy('SORT ASC')
|
|
|
->asArray()
|
kevin