1.fix bug 2.添加获取成长值、获取积分API

app-mall/controllers/UserController.php

@@ -7,6 +7,8 @@ use bizHd\custom\classes\CustomClass;
 use bizHd\wx\classes\WxOpenClass;
 use bizMall\message\services\SmsService;
 use bizMall\user\classes\UserClass;
+use bizMall\user\classes\UserGrowthClass;
+use bizMall\user\classes\UserIntegralClass;
 use bizMall\user\services\UserAssetService;
 use bizMall\user\services\UserService;
 use biz\shop\classes\ShopClass;
@@ -371,4 +373,23 @@ class UserController extends BaseController
         util::success($user);
     }
 
+    //成长值列表
+    public function actionGrowthList()
+    {
+        $where = [];
+        $where['shopId'] = $this->shopId;
+        $where['userId'] = $this->userId;
+        $list = UserGrowthClass::getGrowthList($where);
+        util::success($list);
+    }
+
+    //积分列表
+    public function actionIntegralList()
+    {
+        $where = [];
+        $where['shopId'] = $this->shopId;
+        $where['userId'] = $this->userId;
+        $list = UserIntegralClass::getIntegralList($where);
+        util::success($list);
+    }
 }

biz-hd/custom/observers/BuyAmountObserver.php

@@ -68,6 +68,7 @@ class BuyAmountObserver extends Behavior
 		$createTime = date('Y-m-d H:i:s');
 		$growthEventRemark = isset($model->growthEventRemark) ? trim((string) $model->growthEventRemark) : '';
 		$growthData = [
+		    'shopId' => $model->getAttribute('shopId'),
 			'userId' => $model->getAttribute('userId'),
 			'userName' => $model->getAttribute('name'),
 			'event' => $growthEventRemark !== '' ? $growthEventRemark . '，成长值同步变更' : '累计消费变更同步成长值',
@@ -82,6 +83,7 @@ class BuyAmountObserver extends Behavior
 
 		//积分变动记录
 		$integralData = [
+            'shopId' => $model->getAttribute('shopId'),
 			'userId' => $model->getAttribute('userId'),
 			'userName' => $model->getAttribute('name'),
 			'event' => $growthEventRemark !== '' ? $growthEventRemark . '，积分同步变更' : '累计消费变更同步积分',

biz-hd/user/models/UserIntegral.php

@@ -19,10 +19,10 @@ class UserIntegral extends Base
 	{
 		return [
 			[['userId', 'relateId', 'relateType', 'operatorId'], 'integer'],
-			[['integral', 'num', 'amount'], 'number'],
+			[['integral', 'num'], 'number'],
 			//[['capitalType', 'createTime'], 'required'],
 			[['createTime', 'updateTime'], 'safe'],
-			[['userName', 'alipayId'], 'string', 'max' => 50],
+			[['userName'], 'string', 'max' => 50],
 			[['event'], 'string', 'max' => 200],
 			[['remark'], 'string', 'max' => 1000],
 		];
@@ -38,7 +38,6 @@ class UserIntegral extends Base
 			'userId' => 'User ID',
 			'userName' => 'User Name',
 			'relateId' => 'Relate ID',
-			'amount' => 'Amount',
 			'integral' => 'Integral',
 			'num' => 'Num',
 			'event' => 'Event',

biz-mall/balance/classes/BalanceChangeClass.php

@@ -2,7 +2,6 @@
 
 namespace bizMall\balance\classes;
 
-use Yii;
 use bizMall\base\classes\BaseClass;
 
 class BalanceChangeClass extends BaseClass

biz-mall/user/classes/UserGrowthClass.php

@@ -2,24 +2,21 @@
 
 namespace bizMall\user\classes;
 
-use bizMall\merchant\classes\MerchantAssetClass;
-use bizMall\merchant\services\MerchantService;
-use bizMall\message\classes\ChatClass;
-use bizMall\user\services\UserIntegralService;
-use common\components\business;
-use common\components\dict;
-use common\components\util;
-use common\services\ImageService;
-use common\services\xhMerchantExtendService;
-use common\services\xhUserCapitalService;
-use common\services\xhUserIntegralService;
-use common\services\xhUserMergeService;
-use Yii;
 use bizMall\base\classes\BaseClass;
 
 class UserGrowthClass extends BaseClass
 {
 	
 	public static $baseFile = '\bizMall\user\models\UserGrowth';
-	
+
+    public static function getGrowthList($where)
+    {
+        $data = self::getList('*', $where, 'createTime DESC,id DESC');
+        if (!empty($data['list'])) {
+            foreach ($data['list'] as $k => $v) {
+
+            }
+        }
+        return $data;
+    }
 }

biz-mall/user/classes/UserIntegralClass.php

@@ -7,4 +7,15 @@ use bizMall\base\classes\BaseClass;
 class UserIntegralClass extends BaseClass
 {
 	public static $baseFile = '\bizMall\user\models\UserIntegral';
+
+    public static function getIntegralList($where)
+    {
+        $data = self::getList('*', $where, 'createTime DESC,id DESC');
+        if (!empty($data['list'])) {
+            foreach ($data['list'] as $k => $v) {
+
+            }
+        }
+        return $data;
+    }
 }

biz-mall/user/models/UserIntegral.php

@@ -19,10 +19,10 @@ class UserIntegral extends Base
 	{
 		return [
             [['userId', 'relateId', 'relateType', 'operatorId'], 'integer'],
-            [['integral', 'num', 'amount'], 'number'],
+            [['integral', 'num'], 'number'],
             //[['capitalType', 'createTime'], 'required'],
             [['createTime', 'updateTime'], 'safe'],
-            [['userName', 'alipayId'], 'string', 'max' => 50],
+            [['userName'], 'string', 'max' => 50],
             [['event'], 'string', 'max' => 200],
             [['remark'], 'string', 'max' => 1000],
 		];
@@ -38,7 +38,6 @@ class UserIntegral extends Base
             'userId' => 'User ID',
             'userName' => 'User Name',
             'relateId' => 'Relate ID',
-            'amount' => 'Amount',
             'integral' => 'Integral',
             'num' => 'Num',
             'event' => 'Event',