|
|
@@ -418,7 +418,7 @@ class UserController extends BaseController {
|
|
|
$query_condition = " AND (FIND_IN_SET(1, S.GIFT_TYPE)>0";
|
|
|
}
|
|
|
if($isStudio==1){
|
|
|
- $query_condition.= " OR FIND_IN_SET(3, S.GIFT_TYPE)>0";
|
|
|
+ $query_condition .= " OR FIND_IN_SET(3, S.GIFT_TYPE)>0";
|
|
|
}
|
|
|
|
|
|
$query_condition .= $condition . ' AND N.COUNTRY_ID = ' . $user['COUNTRY_ID'];
|
|
|
@@ -568,6 +568,8 @@ class UserController extends BaseController {
|
|
|
}
|
|
|
$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]));
|
|
|
+
|
|
|
// 只查询普通商品
|
|
|
$allGoods = ShopGoods::find()
|
|
|
->alias('S')
|