|
|
@@ -633,7 +633,7 @@ 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) AND AND N.COUNTRY_ID=:COUNTRY_ID';
|
|
|
+ $condition = ' AND STATUS=1 AND (FIND_IN_SET(2,GIFT_TYPE)>0 OR FIND_IN_SET(4,GIFT_TYPE)>0) 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',
|
zhangl