wanma-benteng
/
new-admin-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复：总平台商品相关订单 不显示的问题

This commit is contained in:
wuhui_zzw 2024-04-11 16:04:31 +08:00
parent 3e1eafbe90
commit d607d3066d
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/common/dao/store/order/StoreOrderDao.php
View File

@ -60,13 +60,24 @@ class StoreOrderDao extends BaseDao
* @day 2020/6/16 * @day 2020/6/16
*/ */
public function search(array $where, $sysDel = 0){ public function search(array $where, $sysDel = 0){
$query = StoreOrder::hasWhere('merchant', function ($query) use ($where) { $query = StoreOrder::alias('StoreOrder')
if (isset($where['is_trader']) && $where['is_trader'] !== '') { ->leftJoin('Merchant','Merchant.mer_id = StoreOrder.mer_id')
->where(function($query){
$query->where('Merchant.is_del',0)->whereOr('StoreOrder.mer_id', 0);
})
->when(isset($where['is_trader']) && $where['is_trader'] !== '', function ($query) use ($where) {
$query->where('is_trader', $where['is_trader']); $query->where('is_trader', $where['is_trader']);
} });
$query->where('is_del',0);
}); // $query = StoreOrder::hasWhere('merchant', function ($query) use ($where) {
// 存在商户id是否 判断商户id类型，显示对应的订单 // if (isset($where['is_trader']) && $where['is_trader'] !== '') {
// $query->where('is_trader', $where['is_trader'])->whereOr('StoreOrder.mer_id', 0);
// }
// $query->where(function($hasQuery){
// $hasQuery->where('is_del',0)->whereOr('StoreOrder.mer_id', 0);
// });
// });
// 存在商户id是否 判断商户id类型，显示对应的订单 30,31,32,33,34
if(isset($where['mer_id']) && $where['mer_id'] !== ''){ if(isset($where['mer_id']) && $where['mer_id'] !== ''){
$merchantType = app()->make(MerchantRepository::class) $merchantType = app()->make(MerchantRepository::class)
->getSearch([]) ->getSearch([])
@ -75,13 +86,12 @@ class StoreOrderDao extends BaseDao
// 供应商 仅显示酒道馆进货订单 // 供应商 仅显示酒道馆进货订单
if($merchantType == 2) $where['activity_type'] = 35; if($merchantType == 2) $where['activity_type'] = 35;
} }
$isWithGoods = $where['is_with_goods'] ?? 0; $isWithGoods = $where['is_with_goods'] ?? 0;
$activityType = $where['activity_type'] ?? 0; $activityType = $where['activity_type'] ?? 0;
if($isWithGoods == 1 || $activityType == 35){ if($isWithGoods == 1 || $activityType == 35){
$query->whereNotIn('StoreOrder.activity_type',[20,30]); $query->whereNotIn('StoreOrder.activity_type',[20,30,31,32,33,34]);
}else{ }else if($activityType == 0){
$query->whereNotIn('StoreOrder.activity_type',[20,30,35]); $query->whereNotIn('StoreOrder.activity_type',[20,30,31,32,33,34,35]);
} }
$query->when(($sysDel !== null), function ($query) use ($sysDel) { $query->when(($sysDel !== null), function ($query) use ($sysDel) {

2
app/common/model/store/order/StoreOrder.php
View File

@ -156,7 +156,7 @@ class StoreOrder extends BaseModel
public function getOpenReceiptAttr() public function getOpenReceiptAttr()
{ {
return merchantConfig($this->mer_id,'mer_open_receipt') ?: 0; return merchantConfig((int)$this->mer_id,'mer_open_receipt') ?: 0;
} }
public function getOrderExtendAttr($val) public function getOrderExtendAttr($val)

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

@ -1828,6 +1828,8 @@ class StoreOrderRepository extends BaseRepository
public function getList(array $where, $page, $limit) public function getList(array $where, $page, $limit)
{ {
$query = $this->dao->search($where)->where('StoreOrder.is_del', 0); $query = $this->dao->search($where)->where('StoreOrder.is_del', 0);
// debug( $this->dao->search($where)->where('StoreOrder.is_del', 0)->fetchSql()->select());
$count = $query->count(); $count = $query->count();
$list = $query->with([ $list = $query->with([
'orderProduct', 'orderProduct',

4
app/controller/api/store/order/StoreOrder.php
View File

@ -180,8 +180,10 @@ class StoreOrder extends BaseController
$where['with_goods_mer_id'] = is_array($agentInfo['mer_id_list']) ? $agentInfo['mer_id_list'] : []; $where['with_goods_mer_id'] = is_array($agentInfo['mer_id_list']) ? $agentInfo['mer_id_list'] : [];
$where['activity_type'] = 35; $where['activity_type'] = 35;
} }
// 获取订单
$result = $this->repository->getList($where, $page, $limit);
return app('json')->success($this->repository->getList($where, $page, $limit)); return app('json')->success($result);
} }
/** /**