|
@@ -130,7 +130,7 @@ class OrderController extends BaseController
|
|
|
$currentFlow = OrderSendClass::withoutSend($order);
|
|
$currentFlow = OrderSendClass::withoutSend($order);
|
|
|
util::success(['currentFlow' => $currentFlow]);
|
|
util::success(['currentFlow' => $currentFlow]);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
//修改价格 shish 2020.1.6
|
|
//修改价格 shish 2020.1.6
|
|
|
public function actionUpdatePrice()
|
|
public function actionUpdatePrice()
|
|
|
{
|
|
{
|
|
@@ -183,7 +183,7 @@ class OrderController extends BaseController
|
|
|
'orderSn' => $order['orderSn'],
|
|
'orderSn' => $order['orderSn'],
|
|
|
'receiveUserName' => $order['receiveUserName'],
|
|
'receiveUserName' => $order['receiveUserName'],
|
|
|
'receiveMobile' => $order['receiveMobile'],
|
|
'receiveMobile' => $order['receiveMobile'],
|
|
|
- 'receiveFullAddress' => $order['receiveFullAddress'],
|
|
|
|
|
|
|
+ 'receiveFullAddress' => $order['receiveAddress'] . $order['receiveFloor'] . "（" . $order['receiveFullAddress'] . "）",
|
|
|
'cardInfo' => $order['cardInfo'],
|
|
'cardInfo' => $order['cardInfo'],
|
|
|
'bookMobile' => $bookMobile,
|
|
'bookMobile' => $bookMobile,
|
|
|
'bookName' => $bookName,
|
|
'bookName' => $bookName,
|
|
@@ -195,5 +195,5 @@ class OrderController extends BaseController
|
|
|
];
|
|
];
|
|
|
util::success($data);
|
|
util::success($data);
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
}
|
|
}
|
shish