新增物流与商品组合选择
This commit is contained in:
@@ -329,7 +329,6 @@ router.get('/', async (req, res) => {
|
||||
|
||||
router.get('/:id', async (req, res) => {
|
||||
try {
|
||||
console.log(1234,req.query)
|
||||
const { id } = req.params;
|
||||
// const isAdmin = req.user.role === 'admin';
|
||||
|
||||
@@ -345,7 +344,7 @@ router.get('/:id', async (req, res) => {
|
||||
const query = `
|
||||
SELECT
|
||||
o.id, o.order_no, o.user_id, o.total_amount, o.total_points,
|
||||
o.status, o.address, o.created_at, o.updated_at,
|
||||
o.status, o.address, o.created_at, o.updated_at, o.delivery_code, o.logistics_company,
|
||||
u.username, u.phone
|
||||
FROM orders o
|
||||
LEFT JOIN users u ON o.user_id = u.id
|
||||
@@ -386,7 +385,7 @@ router.get('/:id', async (req, res) => {
|
||||
}
|
||||
|
||||
// 处理地址信息
|
||||
console.log(order.address,'order.address');
|
||||
// console.log(order.address,'order.address');
|
||||
|
||||
if (order.address) {
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user