|
|
@@ -6,7 +6,6 @@ use biz\merchant\services\MerchantExtendService;
|
|
|
use biz\merchant\services\MerchantService;
|
|
|
use biz\merchant\services\ShopService;
|
|
|
use biz\order\services\OrderService;
|
|
|
-use biz\saas\services\DistrictService;
|
|
|
use biz\saas\services\RegionService;
|
|
|
use biz\user\services\UserService;
|
|
|
use common\components\configDict;
|
|
|
@@ -38,7 +37,7 @@ class OrderController extends BaseController
|
|
|
$list['asset'] = $this->merchantAsset;
|
|
|
util::success($list);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//订单详情 shish 2019.12.16
|
|
|
public function actionDetail()
|
|
|
{
|
|
|
@@ -139,16 +138,16 @@ class OrderController extends BaseController
|
|
|
OrderService::updateById($id, ['actPrice' => $price]);
|
|
|
util::ok('修改成功');
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
//下单要用到的相关信息 shish 2019.12.6
|
|
|
public function actionOrderRelate()
|
|
|
{
|
|
|
- $regionTree = DistrictService::tree();
|
|
|
+ $regionTree = RegionService::tree();
|
|
|
$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];
|
|
|
util::success($out);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
shish