通知接口名修改

app/business/controllers/BaseController.php

@@ -99,7 +99,7 @@ class BaseController extends PublicController
         util::success($list);
     }
 
-    public function actionCreate()
+    public function actionAdd()
     {
         $data = Yii::$app->request->post();
 
@@ -108,7 +108,7 @@ class BaseController extends PublicController
         util::success($re);
     }
 
-    public function actionView()
+    public function actionGetById()
     {
         $id = Yii::$app->request->get('id');
 

app/client/controllers/BaseController.php

@@ -33,6 +33,7 @@ class BaseController extends PublicController
 
 		$header = httpUtil::getHeader();
 		$account = isset($header['account']) ? $header['account'] : 0;
+		$account = 12358;
 		if (empty($account)) {
 			util::fail('商家无效');
 		}

app/client/controllers/OrderController.php

@@ -23,13 +23,13 @@ class OrderController extends BaseController
 	//商城下单操作 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;
@@ -87,7 +87,7 @@ class OrderController extends BaseController
 		$couponId = isset($post['couponId']) && !empty($post['couponId']) ? $post['couponId'] : 0;
 		//没有使用优惠券，默认使用会员优惠
 		if (empty($couponId)) {
-			$discountInfo = UserAssetService::getDiscount();
+			$discountInfo = UserAssetService::getDiscount($this->userId);
 			if (isset($discountInfo['member'])) {
 				$discount = $discountInfo['member']['discount'];
 				$actPrice = ($actPrice * ($discount * 10000)) / 10000;

app/client/controllers/UserController.php

@@ -18,7 +18,8 @@ class UserController extends BaseController {
 	//获取登陆客户的优惠情况  shish 2019.12.3
 	public function actionGetDiscount()
 	{
-		$discount = UserAssetService::getDiscount();
+		$userId = Yii::$app->params['userId'];
+		$discount = UserAssetService::getDiscount($userId);
 		util::success($discount);
 	}
 

biz/user/services/UserAssetService.php

@@ -22,9 +22,8 @@ class UserAssetService extends BaseService
 	}
 	
 	//获取登陆客户的优惠方式 shish 2019.12.3
-	public static function getDiscount()
+	public static function getDiscount($userId)
 	{
-		$userId = Yii::$app->params['userId'];
 		$asset = UserAssetClass::getByUserId($userId);
 		$random = rand(1, 4);
 		if ($random == 1) {