|
@@ -48,7 +48,7 @@ class OrderController extends BaseController
|
|
|
$user = $this->user;
|
|
$user = $this->user;
|
|
|
$post['bookName'] = isset($user['userName']) ? $user['userName'] : '';
|
|
$post['bookName'] = isset($user['userName']) ? $user['userName'] : '';
|
|
|
$bookMobile = isset($post['bookMobile']) && !empty($post['bookMobile']) && stringUtil::isMobile($post['bookMobile']) ? $post['bookMobile'] : '';
|
|
$bookMobile = isset($post['bookMobile']) && !empty($post['bookMobile']) && stringUtil::isMobile($post['bookMobile']) ? $post['bookMobile'] : '';
|
|
|
- $bookMobile = empty($bookMobile) && isset($user['mobile']) && !empty($user['mobile']) ? $user['mobile'] : '';
|
|
|
|
|
|
|
+ $bookMobile = empty($bookMobile) && isset($user['mobile']) && !empty($user['mobile']) ? $user['mobile'] : $bookMobile;
|
|
|
$post['bookMobile'] = $bookMobile;
|
|
$post['bookMobile'] = $bookMobile;
|
|
|
|
|
|
|
|
$post['payWay'] = $this->isWx == true ? 0 : 1;
|
|
$post['payWay'] = $this->isWx == true ? 0 : 1;
|
|
@@ -107,6 +107,7 @@ class OrderController extends BaseController
|
|
|
|
|
|
|
|
$post['prePrice'] = $prePrice;
|
|
$post['prePrice'] = $prePrice;
|
|
|
$post['actPrice'] = $actPrice;
|
|
$post['actPrice'] = $actPrice;
|
|
|
|
|
+ dd($post);
|
|
|
$order = OrderService::addOrder($post);
|
|
$order = OrderService::addOrder($post);
|
|
|
$orderId = $order['id'];
|
|
$orderId = $order['id'];
|
|
|
$orderSn = $order['orderSn'];
|
|
$orderSn = $order['orderSn'];
|
|
@@ -253,7 +254,7 @@ class OrderController extends BaseController
|
|
|
$user = $this->user;
|
|
$user = $this->user;
|
|
|
$post['bookName'] = isset($user['userName']) ? $user['userName'] : '';
|
|
$post['bookName'] = isset($user['userName']) ? $user['userName'] : '';
|
|
|
$bookMobile = isset($post['bookMobile']) && !empty($post['bookMobile']) && stringUtil::isMobile($post['bookMobile']) ? $post['bookMobile'] : '';
|
|
$bookMobile = isset($post['bookMobile']) && !empty($post['bookMobile']) && stringUtil::isMobile($post['bookMobile']) ? $post['bookMobile'] : '';
|
|
|
- $bookMobile = empty($bookMobile) && isset($user['mobile']) && !empty($user['mobile']) ? $user['mobile'] : '';
|
|
|
|
|
|
|
+ $bookMobile = empty($bookMobile) && isset($user['mobile']) && !empty($user['mobile']) ? $user['mobile'] : $bookMobile;
|
|
|
$post['bookMobile'] = $bookMobile;
|
|
$post['bookMobile'] = $bookMobile;
|
|
|
$prePrice = round($post['prePrice'], 2);
|
|
$prePrice = round($post['prePrice'], 2);
|
|
|
$couponId = isset($post['couponId']) ? $post['couponId'] : 0;
|
|
$couponId = isset($post['couponId']) ? $post['couponId'] : 0;
|
shish