|
@@ -119,6 +119,7 @@ class Shop extends BaseController
|
|
|
// 'city' => $address['city'],
|
|
// 'city' => $address['city'],
|
|
|
// 'district' => $address['district'],
|
|
// 'district' => $address['district'],
|
|
|
'user_address' => $address['detail'],
|
|
'user_address' => $address['detail'],
|
|
|
|
|
+ 'address_id' => $post['address_id'],
|
|
|
'total_price' => $totalMoney,
|
|
'total_price' => $totalMoney,
|
|
|
'total_num' => $totalNum,
|
|
'total_num' => $totalNum,
|
|
|
'total_postage' => $postage,
|
|
'total_postage' => $postage,
|
|
@@ -239,7 +240,7 @@ class Shop extends BaseController
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$order['cart_info'] = $cartInfo;
|
|
$order['cart_info'] = $cartInfo;
|
|
|
-
|
|
|
|
|
|
|
+ $order['address_info'] = Db::name('user_address')->where('id', $order['address_id'])->find();
|
|
|
return app('json')->success($order);
|
|
return app('json')->success($order);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -356,6 +357,7 @@ class Shop extends BaseController
|
|
|
// 更新订单状态
|
|
// 更新订单状态
|
|
|
Db::name('store_order')->where('id', $orderData['id'])->update([
|
|
Db::name('store_order')->where('id', $orderData['id'])->update([
|
|
|
'paid' => 1,
|
|
'paid' => 1,
|
|
|
|
|
+ 'status' => 1,
|
|
|
'pay_time' => time()
|
|
'pay_time' => time()
|
|
|
]);
|
|
]);
|
|
|
|
|
|