|
|
@@ -113,7 +113,24 @@ class Shop extends BaseController
|
|
|
->order('o.id', 'desc')
|
|
|
->select()
|
|
|
->toArray();
|
|
|
+ // 关联订单商品信息
|
|
|
+ if (!empty($data)) {
|
|
|
+ foreach ($data as &$order) {
|
|
|
+ $cartInfo = Db::name('store_order_cart_info')
|
|
|
+ ->where('oid', $order['id'])
|
|
|
+ ->select()
|
|
|
+ ->toArray();
|
|
|
|
|
|
+ foreach ($cartInfo as &$item) {
|
|
|
+ if (!empty($item['cart_info'])) {
|
|
|
+ $innerCartInfo = json_decode($item['cart_info'], true);
|
|
|
+ unset($item['cart_info']);
|
|
|
+ $item = array_merge($item, $innerCartInfo);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ $order['cart_info'] = $cartInfo;
|
|
|
+ }
|
|
|
+ }
|
|
|
$pageCount = $order->where($where)->count();
|
|
|
|
|
|
$result = UtilService::getParam([
|
