mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'dev' (#149) from dev into master

Browse Source 
Reviewed-on: #149
This commit is contained in:
mkm 2024-02-21 10:29:12 +08:00
commit cdeea8c980
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/repositories/store/order/StoreGroupOrderRepository.php
View File

@ -67,7 +67,7 @@ class StoreGroupOrderRepository extends BaseRepository
{
$query = StoreGroupOrder::getDB()->alias('StoreGroupOrder');
if(isset($where['source']) && $where['source'] == 103){
$wheres['activity_type']=[0,98];
$wheres['activity_type']=[0, 2, 98];
$wheres['source']=[0,2,103,105];
}else{
$wheres['activity_type']=0;

1
app/controller/api/store/product/StoreSpu.php
View File

@ -69,6 +69,7 @@ class StoreSpu extends BaseController
if (isset($where['type_code']) && $where['type_code'] == 'PersonalStore') {
$where['long'] = '';
$where['lat'] = '';
$where['type_id'] = 21;
} else {
[$lat, $lng] = (new CityAreaDao())->getLngAndLat($where['location'], $where['street_id']);
$where['long'] = $lng;