统一接口

app/business/controllers/UserController.php

@@ -22,7 +22,7 @@ class UserController extends BaseController
 	
 	
 	//客户列表 shish 2019.11.30
-	public function actionGetList()
+	public function actionList()
 	{
 		$get = Yii::$app->request->get();
 		//组建where
@@ -52,7 +52,7 @@ class UserController extends BaseController
 	}
 	
 	//获取客户基本和资产信息 shish 2019.11.30
-	public function actionGetInfo()
+	public function actionInfo()
 	{
 		$userId = Yii::$app->request->get('userId');
 		$info = UserService::getUserInfo($userId);

app/client/controllers/OrderController.php

@@ -5,11 +5,13 @@ namespace client\controllers;
 use biz\goods\services\CategoryService;
 use biz\goods\services\GoodsCategoryService;
 use biz\goods\services\GoodsService;
+use biz\merchant\services\MerchantExtendService;
 use biz\merchant\services\MerchantService;
 use biz\merchant\services\ShopService;
 use biz\order\services\OrderGoodsService;
 use biz\order\services\OrderService;
 use biz\promote\services\CouponService;
+use biz\saas\services\RegionService;
 use biz\user\services\UserAssetService;
 use common\components\configDict;
 use common\components\stringUtil;
@@ -19,17 +21,18 @@ use common\components\util;
 
 class OrderController extends BaseController
 {
+
+	//下单要用到的相关信息 shish 2019.12.6
+	public function actionOrderRelate()
+	{
+		RegionService::tree();
+		$shop = ShopService::getDefaultShopInfo($this->merchant);
+		$freight = MerchantExtendService::getFreight($this->merchantExtend);
+	}
 	
 	//商城下单操作 shish 2019.12.3
 	public function actionCreateOrder()
 	{
-		
-		//给出省市区的接口 todo
-		//给出商家门店地址接口 todo
-		//给出腾讯的接口 todo
-		//运费 计算方式 todo
-		//余额支付 要使用哪个接口 todo
-		
 		$post = Yii::$app->request->post();
 		$goodsId = isset($post['goodsId']) ? $post['goodsId'] : 0;
 		$goodsStyleId = isset($post['goodsStyleId']) ? $post['goodsStyleId'] : 0;
@@ -126,7 +129,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()
 	{

biz/saas/classes/RegionBakClass.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace biz\saas\classes;
+
+use Yii;
+use biz\base\classes\BaseClass;
+
+class RegionBakClass extends BaseClass
+{
+	
+	public static $baseFile = '\biz\saas\models\RegionBak';
+
+}

biz/saas/classes/RegionClass.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace biz\saas\classes;
+
+use Yii;
+use biz\base\classes\BaseClass;
+
+class RegionClass extends BaseClass
+{
+	
+	public static $baseFile = '\biz\saas\models\Region';
+
+}

biz/saas/models/Region.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace biz\saas\models;
+
+use biz\base\models\Base;
+
+class Region extends Base
+{
+
+	public static function tableName()
+	{
+		return 'xhRegion';
+	}
+	
+}

biz/saas/models/RegionBak.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace biz\saas\models;
+
+use biz\base\models\Base;
+
+class RegionBak extends Base
+{
+
+	public static function tableName()
+	{
+		return 'xhRegionBak';
+	}
+	
+}

biz/saas/services/RegionService.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace biz\saas\services;
+use biz\base\services\BaseService;
+use biz\saas\classes\RegionBakClass;
+use biz\saas\models\RegionBak;
+use Yii;
+
+class RegionService extends BaseService
+{
+
+	public static $baseFile = '\biz\saas\classes\RegionClass';
+
+}

sql.txt

@@ -1,3 +1,6 @@
+2019.12.6 shish
+增加xhRegion表结构和数据！！
+
 2019.12.5 shish
 ALTER TABLE xhOrderGoods CHANGE `multipleTitle` `goodsStyleName` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '款式名称';
 ALTER TABLE xhOrderGoods CHANGE `multiPriceId` `goodsStyleId` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '款式id';