|
|
@@ -37,7 +37,7 @@ class OrderController extends BaseController
|
|
|
$list['asset'] = $this->merchantAsset;
|
|
|
util::success($list);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//订单详情 shish 2019.12.16
|
|
|
public function actionDetail()
|
|
|
{
|
|
|
@@ -138,7 +138,7 @@ class OrderController extends BaseController
|
|
|
OrderService::updateById($id, ['actPrice' => $price]);
|
|
|
util::ok('修改成功');
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//下单要用到的相关信息 shish 2019.12.6
|
|
|
public function actionOrderRelate()
|
|
|
{
|
|
|
@@ -146,7 +146,7 @@ class OrderController extends BaseController
|
|
|
$shop = ShopService::getDefaultShop($this->merchant);
|
|
|
$freight = MerchantExtendService::getFreight($this->merchantExtend);
|
|
|
$mapKey = 'OFWBZ-2NTHP-EHNDD-LKWQY-GANM7-PXBJH';
|
|
|
- $out = ['freight' => $freight, 'shop' => $shop, 'region' => $regionTree, 'txMapKey' => $mapKey];
|
|
|
+ $out = ['freight' => $freight, 'shop' => $shop, 'region' => $regionTree, 'txMapKey' => $mapKey, 'address' => ['province' => '福建省', 'city' => '厦门市']];
|
|
|
util::success($out);
|
|
|
}
|
|
|
|
shish