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

更新商品详情

Browse Source
This commit is contained in:
yaooo 2023-08-18 16:22:55 +08:00
parent af10861443
commit 6dcfc634ef
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,13 +99,13 @@ class StoreOrderDao extends BaseDao
// 12表示信用购 // 12表示信用购
switch ($where['status']) { switch ($where['status']) {
case 0 : case 0 :
$query->where('paid', 1)->whereIn('StoreOrder.status', [0, 9]); $query->where('StoreOrder.paid', 1)->whereIn('StoreOrder.status', [0, 9]);
break; break;
case 1 : case 1 :
$query->where('paid', 1)->where('StoreOrder.status', 1); $query->where('paid', 1)->where('StoreOrder.status', 1);
break; break;
case 2 : case 2 :
$query->where('paid', 1)->where('StoreOrder.status', 2)->where('pay_type', '<>', StoreGroupOrder::PAY_TYPE_CREDIT_BUY); $query->where('StoreOrder.paid', 1)->where('StoreOrder.status', 2)->where('pay_type', '<>', StoreGroupOrder::PAY_TYPE_CREDIT_BUY);
break; break;
case 3 : case 3 :
$query->where('paid', 1)->where('StoreOrder.status', 1); $query->where('paid', 1)->where('StoreOrder.status', 1);
@ -122,7 +122,7 @@ class StoreOrderDao extends BaseDao
$query->where('paid', 1)->whereIn('StoreOrder.status', [2, 3]); $query->where('paid', 1)->whereIn('StoreOrder.status', [2, 3]);
break; break;
default: default:
// $query->where('paid', 1)->where('StoreOrder.status', $where['status']); $query->where('paid', 1)->where('StoreOrder.status', $where['status']);
break; break;
} }
}) })

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

@ -876,7 +876,7 @@ class StoreOrderRepository extends BaseRepository
case 1: case 1:
break; // 未支付 break; // 未支付
case 2: case 2:
$param['paid'] = 1; $param['StoreOrder.paid'] = 1;
$param['StoreOrder.status'] = 0; $param['StoreOrder.status'] = 0;
break; // 待发货 break; // 待发货
case 3: case 3:
@ -1601,7 +1601,6 @@ class StoreOrderRepository extends BaseRepository
]); ]);
$count = $query->count(); $count = $query->count();
$list = $query->page($page, $limit)->select()->append(['refund_extension_one', 'refund_extension_two']); $list = $query->page($page, $limit)->select()->append(['refund_extension_one', 'refund_extension_two']);
return compact('count', 'list'); return compact('count', 'list');
} }

7
app/controller/api/community/Community.php
View File

@ -594,6 +594,13 @@ class Community extends BaseController
if ($resaleList) $resaleList = $resaleList->toArray(); if ($resaleList) $resaleList = $resaleList->toArray();
foreach($resaleList as $k=>$v) { foreach($resaleList as $k=>$v) {
$resaleList[$k]['detail'] = json_decode($v['detail'], true); $resaleList[$k]['detail'] = json_decode($v['detail'], true);
if (empty($v['image'])) {
$prodImage = Db::name('store_product')->where('product_id', $v['product_id'])->value('image');
$prodImageList = explode(',', $prodImage);
if (count($prodImageList) > 0) {
$resaleList[$k]['image'] = $prodImageList[0];
}
}
} }
$communityInfo['resale'] = $resaleList; $communityInfo['resale'] = $resaleList;
return app('json')->success($communityInfo); return app('json')->success($communityInfo);