|
@@ -25,7 +25,7 @@ class GhsOrderController extends Controller
|
|
|
'payTime' => ['between', [$minPayTime, $maxPayTime]],
|
|
'payTime' => ['between', [$minPayTime, $maxPayTime]],
|
|
|
];
|
|
];
|
|
|
|
|
|
|
|
- $ghsShops = ShopClass::getAllByCondition(['ptStyle' => 2, 'live' => 1], null, 'mainId');
|
|
|
|
|
|
|
+ $ghsShops = ShopClass::getAllByCondition(['mainId' => 50, 'ptStyle' => 2, 'live' => 1], null, 'mainId');
|
|
|
if (!empty($ghsShops)) {
|
|
if (!empty($ghsShops)) {
|
|
|
$mainIds = array_unique(array_filter(array_column($ghsShops, 'mainId')));
|
|
$mainIds = array_unique(array_filter(array_column($ghsShops, 'mainId')));
|
|
|
if (!empty($mainIds)) {
|
|
if (!empty($mainIds)) {
|
|
@@ -65,7 +65,7 @@ class GhsOrderController extends Controller
|
|
|
'payTime<' => $maxPayTime,
|
|
'payTime<' => $maxPayTime,
|
|
|
];
|
|
];
|
|
|
|
|
|
|
|
- $ghsShops = ShopClass::getAllByCondition(['ptStyle' => 2, 'live' => 1], null, 'mainId');
|
|
|
|
|
|
|
+ $ghsShops = ShopClass::getAllByCondition(['mainId' => 50, 'ptStyle' => 2, 'live' => 1], null, 'mainId');
|
|
|
if (!empty($ghsShops)) {
|
|
if (!empty($ghsShops)) {
|
|
|
$mainIds = array_unique(array_filter(array_column($ghsShops, 'mainId')));
|
|
$mainIds = array_unique(array_filter(array_column($ghsShops, 'mainId')));
|
|
|
if (!empty($mainIds)) {
|
|
if (!empty($mainIds)) {
|
