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

修改商户地址存储

Browse Source
This commit is contained in:
luofei 2023-05-25 13:55:07 +08:00
parent cae80dfa69
commit 461be6d915
4 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/common/dao/system/merchant/MerchantDao.php
View File

@ -53,8 +53,7 @@ class MerchantDao extends BaseDao
$query->where('is_trader', $where['is_trader']);
})
->when(isset($where['street_id']) && $where['street_id'] !== '', function ($query) use ($where) {
$mer_id = Db::name('merchant_address')->where('street_id', $where['street_id'])->column('mer_id');
$query->whereIn('mer_id',$mer_id ?: '' );
$query->where('street_id', $where['street_id']);
})
->when(isset($where['is_best']) && $where['is_best'] !== '', function ($query) use ($where) {
$query->where('is_best', $where['is_best']);

10
app/controller/api/Common.php
View File

@ -493,9 +493,13 @@ class Common extends BaseController
}
//获取云店铺
public function get_cloud_shop($street_code){
$find=DB::name('merchant')->alias('m')->where('m.type_id',11)->where('m.is_del',0)->where('m.status',1)
->join('merchant_address a','a.mer_id=m.mer_id and a.street_id='.$street_code)
public function get_cloud_shop(int $street_code){
$find=DB::name('merchant')
->alias('m')
->where('m.type_id',11)
->where('m.is_del',0)
->where('m.status',1)
->where('m.street_id',$street_code)
->join('merchant_category c','m.category_id=c.merchant_category_id')
->field('m.mer_id,category_id,category_name,c.background,c.description')->select();
return app('json')->success($find??[]);

10
app/controller/api/store/order/StoreMicropayOrder.php
View File

@ -113,15 +113,11 @@ class StoreMicropayOrder extends BaseController
$addressId=Db::name('user_address')->where('uid',$uid)->find();
$merchant=Db::name('merchant')->where('mer_id',$mer_id)->find();
if (!$addressId){
$merchant_address=Db::name('merchant_address')->where('mer_id',$mer_id)->find();
if (!$merchant_address){
return app('json')->fail('商户地址不存在');
}
if ($merchant_address['area_id']==0||$merchant_address['street_id']==0||$merchant_address['village_id']==0){
if ($merchant['area_id']==0||$merchant['street_id']==0||$merchant['village_id']==0){
return app('json')->fail('商户地址不完整');
}
$area_name=Db::name('geo_area')->where('area_code',$merchant_address['area_id'])->value('area_name');
$street_name=Db::name('geo_street')->where('street_code',$merchant_address['street_id'])->value('street_name');
$area_name=Db::name('geo_area')->where('area_code',$merchant['area_id'])->value('area_name');
$street_name=Db::name('geo_street')->where('street_code',$merchant['street_id'])->value('street_name');
$district_id=Db::name('city_area')->where('name',$area_name)->value('id');
$street_id=Db::name('city_area')->where('name',$street_name)->value('id');
$data=[

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

@ -102,18 +102,15 @@ class StoreSpu extends BaseController
'keyword', 'cate_id', 'order', 'price_on', 'price_off', 'brand_id', 'pid', 'mer_cate_id', ['product_type', 0], 'action', 'common'
]);
if ($where['action']) unset($where['product_type']);
$category_id=Db::name('merchant')->where('mer_id',$id)->value('category_id');
$streetId = Db::name('merchant_address')->where('mer_id', $id)->value('street_id');
$mer_id=Db::name('merchant')
->alias('m')
->leftJoin('merchant_address ma', 'm.mer_id=ma.mer_id')
->where('street_id',$streetId)
$currentMerchant = Db::name('merchant')->where('mer_id',$id)->field('category_id,street_id')->find();
$mer_id = Db::name('merchant')
->where('street_id',$currentMerchant['street_id'])
->where('mer_state',1)
->where('m.status',1)
->where('category_id',$category_id)
->where('status',1)
->where('category_id',$currentMerchant['category_id'])
->where('type_id',Merchant::TypeCloudWarehouse)
->value('m.mer_id');
if (!$mer_id){
->value('mer_id');
if (!$mer_id) {
return app('json')->success(['count'=>0,'list'=>[]]);
}
$where['mer_id'] = $mer_id;