已经处理到升级的流水类型

app/business/controllers/UserController.php

@@ -10,6 +10,7 @@ use biz\user\services\UserAssetService;
 use biz\user\services\UserGrowthService;
 use biz\user\services\UserIntegralService;
 use biz\user\services\UserService;
+use biz\user\services\UserUpgradeService;
 use common\components\wxUtil;
 use common\services\xhMerchantExtendService;
 use common\services\xhRechargeService;
@@ -142,10 +143,9 @@ class UserController extends BaseController
 		if (empty($user)) {
 			util::fail('客户不存在');
 		}
-		if ($user['merchantId'] != $this->merchantId) {
-			util::fail('您没有权限操作');
-		}
-		
+		//验证是否商家客户
+		UserService::valid($user, $this->merchantId);
+		//验证确认密码
 		$confirmPassword = $post['confirmPassword'];
 		AdminService::verifyConfirmPassword($this->adminId, $confirmPassword);
 		
@@ -164,19 +164,29 @@ class UserController extends BaseController
 		$connection = Yii::$app->db;//事务处理
 		$transaction = $connection->beginTransaction();
 		try {
-
+			
 			$addGrowth = $newLevelGrowth - $userAsset['growth'];
 			$upData['growth'] = $newLevelGrowth;
 			$upData['member'] = $member;
 			$upData['discount'] = $newDiscount;
 			UserAssetService::updateByUserId($userId, $upData);
 			UserService::updateById($userId, ['member' => $member]);
-
+			
+			$upgradeData = [
+				'member' => $member,
+				'prevMember' => $userAsset['member'],
+				'merchantId' => $this->merchantId,
+				'type' => 0,
+				'addTime' => $now,
+				'userId' => $userId,
+			];
+			$upgradeRespond = UserUpgradeService::add($upgradeData);
+			
 			$growthData = [
 				'userId' => $userId,
 				'userName' => $user['userName'],
 				'merchantId' => $this->merchantId,
-				'relateId' => '',
+				'relateId' => $upgradeRespond['id'],
 				'growth' => $newLevelGrowth,
 				'num' => $addGrowth,
 				'io' => 1,

biz/user/classes/UserUpgradeClass.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace biz\user\classes;
+
+use biz\merchant\classes\MerchantAssetClass;
+use biz\merchant\classes\MerchantClass;
+use biz\merchant\services\MerchantService;
+use biz\message\classes\ChatClass;
+use biz\user\services\UserIntegralService;
+use common\components\business;
+use common\components\configDict;
+use common\components\util;
+use common\components\wxUtil;
+use common\services\ImageService;
+use common\services\xhMerchantExtendService;
+use common\services\xhUserCapitalService;
+use common\services\xhUserIntegralService;
+use common\services\xhUserMergeService;
+use Yii;
+use biz\base\classes\BaseClass;
+
+class UserUpgradeClass extends BaseClass
+{
+	
+	public static $baseFile = '\biz\user\models\UserUpgrade';
+
+}

biz/user/models/User.php

@@ -5,9 +5,6 @@ use biz\base\models\Base;
 class User extends Base
 {
 
-	/**
-	 * @inheritdoc
-	 */
 	public static function tableName()
 	{
 		return 'xhUser';

biz/user/models/UserUpgrade.php

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

biz/user/services/UserUpgradeService.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace biz\user\services;
+
+use biz\base\services\BaseService;
+use biz\merchant\classes\MerchantAssetClass;
+use biz\merchant\services\MerchantAssetService;
+use biz\merchant\services\MerchantExtendService;
+use biz\order\services\OrderService;
+use biz\user\classes\UserClass;
+use common\components\util;
+use common\components\validate;
+use common\services\ImageService;
+use common\services\xhMerchantExtendService;
+use common\services\xhMerchantService;
+use Yii;
+use common\components\wxUtil;
+
+class UserUpgradeService extends BaseService
+{
+
+	public static $baseFile = '\biz\user\classes\UserUpgradeClass';
+
+}

console/controllers/UpgradeController.php

@@ -1174,6 +1174,17 @@ merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
 `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间'
 ) COMMENT='商家初始信息';";
 		Yii::$app->db->createCommand($sql)->execute($sql);
+		
+		$sql = "CREATE TABLE xhUserUpgrade(
+id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+userId INT NOT NULL DEFAULT 0 COMMENT '客户id',
+`type` TINYINT NOT NULL DEFAULT 0 COMMENT '升级类型 0管理员操作升级',
+`member` SMALLINT NOT NULL DEFAULT 0 COMMENT '升级后等级',
+`prevMember` SMALLINT NOT NULL DEFAULT 0 COMMENT '升级前等级',
+`addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间'
+)COMMENT='客户升级';";
+		Yii::$app->db->createCommand($sql)->execute($sql);
 
 	}