|
|
@@ -25,11 +25,13 @@ class OrderController extends BaseController
|
|
|
//下单要用到的相关信息 shish 2019.12.6
|
|
|
public function actionOrderRelate()
|
|
|
{
|
|
|
- RegionService::tree();
|
|
|
+ $regionTree = RegionService::tree();
|
|
|
$shop = ShopService::getDefaultShopInfo($this->merchant);
|
|
|
$freight = MerchantExtendService::getFreight($this->merchantExtend);
|
|
|
+ $out = ['freight' => $freight, 'shop' => $shop, 'region' => $regionTree];
|
|
|
+ util::success($out);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//商城下单操作 shish 2019.12.3
|
|
|
public function actionCreateOrder()
|
|
|
{
|
|
|
@@ -129,13 +131,13 @@ class OrderController extends BaseController
|
|
|
|
|
|
util::success(['orderId' => $orderId, 'totalPrice' => $showPrice, 'couponId' => $couponId]);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//余额支付 shish 2019.12.6
|
|
|
public function actionBalancePay()
|
|
|
{
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//获取商城下单要用的微信支付参数 shish 2019.21.3
|
|
|
public function actionWxPay()
|
|
|
{
|
|
|
@@ -147,7 +149,7 @@ class OrderController extends BaseController
|
|
|
|
|
|
//验证订单有效性
|
|
|
OrderService::valid($order, $this->userId);
|
|
|
-
|
|
|
+
|
|
|
$name = isset($order['orderName']) && !empty($order['orderName']) ? $order['orderName'] : '购买商品';
|
|
|
$totalFee = $order['actPrice'];
|
|
|
$openId = $this->user['openId'];
|