|
|
@@ -122,7 +122,7 @@ class OrderController extends BaseController
|
|
|
OrderGoodsService::add($data);//创建订单商品列表
|
|
|
util::success(['orderSn' => $orderSn, 'totalPrice' => $showPrice, 'couponId' => $couponId]);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//下单要用到的相关信息 shish 2019.12.6
|
|
|
public function actionOrderRelate()
|
|
|
{
|
|
|
@@ -141,9 +141,9 @@ class OrderController extends BaseController
|
|
|
$payPassword = isset($post['payPassword']) ? $post['payPassword'] : 0;
|
|
|
$couponId = isset($post['couponId']) ? $post['couponId'] : 0;
|
|
|
$order = OrderService::getByOrderSn($orderSn);
|
|
|
-
|
|
|
+
|
|
|
//dd(password_hash('123456', PASSWORD_BCRYPT));
|
|
|
-
|
|
|
+
|
|
|
//验证支付密码是否正确
|
|
|
UserService::validPayPassword($payPassword, $this->user);
|
|
|
|
|
|
@@ -163,8 +163,8 @@ class OrderController extends BaseController
|
|
|
ini_set('date.timezone', 'Asia/Shanghai');
|
|
|
$post = Yii::$app->request->post();
|
|
|
$couponId = isset($post['couponId']) ? $post['couponId'] : 0;
|
|
|
- $orderId = isset($post['orderId']) ? $post['orderId'] : 0;
|
|
|
- $order = OrderService::getById($orderId);
|
|
|
+ $orderSn = isset($post['orderSn']) ? $post['orderSn'] : 0;
|
|
|
+ $order = OrderService::getByOrderSn($orderSn);
|
|
|
|
|
|
//验证订单有效性
|
|
|
OrderService::valid($order, $this->userId);
|
|
|
@@ -246,6 +246,7 @@ class OrderController extends BaseController
|
|
|
$post['sourceType'] = $sourceType;
|
|
|
$order = OrderService::addOrder($post);
|
|
|
$orderId = $order['id'];
|
|
|
+ $orderSn = $order['orderSn'];
|
|
|
$merchantId = $this->merchantId;
|
|
|
$couponId = isset($post['couponId']) ? $post['couponId'] : 0;
|
|
|
|
shish