会员状态字段优化

app/business/controllers/UserController.php

@@ -35,7 +35,7 @@ class UserController extends BaseController
 				break;
 			case 2:
 				//会员
-				$where['isMember'] = 1;
+				$where['member>'] = -1;
 				break;
 			default:
 		}
@@ -99,10 +99,10 @@ class UserController extends BaseController
 		$user = UserService::replaceUser($originalInfo, $source, $merchantId);
 		
 		//等级
-		$memberLevel = isset($post['memberLevel']) ? $post['memberLevel'] : 0;
+		$member = isset($post['member']) ? $post['member'] : 0;
 		$extend = MerchantExtendService::getByMerchantId($this->merchantId);
 		$gradeList = xhMerchantExtendService::getGradeList($extend, 'desc');
-		$growth = isset($gradeList[$memberLevel]['growth']) ? $gradeList[$memberLevel]['growth'] : 0;
+		$growth = isset($gradeList[$member]['growth']) ? $gradeList[$member]['growth'] : 0;
 		
 		//余额成长值更新
 		$userId = $user['id'];
@@ -148,7 +148,7 @@ class UserController extends BaseController
 	{
 		$post = Yii::$app->request->post();
 		$userId = isset($post['userId']) ? $post['userId'] : 0;
-		$memberLevel = isset($post['memberLevel']) ? $post['memberLevel'] : 0;
+		$member = isset($post['member']) ? $post['member'] : 0;
 		$user = UserService::getById($userId);
 		if (empty($user)) {
 			util::fail('客户不存在');
@@ -161,12 +161,12 @@ class UserController extends BaseController
 		AdminService::verifyConfirmPassword($this->adminId, $confirmPassword);
 		
 		$grade = xhMerchantExtendService::getGradeList($this->merchantExtend, 'desc');
-		$newLevelGrowth = $grade[$memberLevel]['growth'];//升级到当前级别需要的积分数
+		$newLevelGrowth = $grade[$member]['growth'];//升级到当前级别需要的积分数
 		$userAsset = UserAssetService::getByUserId($userId);//用户资产
-		if (!empty($userAsset['isMember']) && $userAsset['memberLevel'] >= $memberLevel) {
+		if ($userAsset['member'] != -1 && $userAsset['member'] >= $member) {
 			util::fail('客户已经达到此级别了');
 		}
-		
+
 		$now = time();
 		$date = date("Y-m-d H:i", $now);
 		
@@ -177,8 +177,7 @@ class UserController extends BaseController
 			$addGrowth = $newLevelGrowth - $userAsset['growth'];
 			//升级后的成长值
 			$upData['growth'] = $newLevelGrowth;
-			$upData['memberLevel'] = $memberLevel;
-			$upData['isMember'] = 1;
+			$upData['member'] = $member;
 			UserAssetService::updateByUserId($userId, $upData);
 			
 			$integralData = [
@@ -217,7 +216,7 @@ class UserController extends BaseController
 		$data = [
 			"touser" => $openId, "template_id" => $tempId, "url" => '',
 			"data" => [
-				"first" => ["value" => "恭喜，您已经升为{$memberLevel}级会员。", "color" => "#173177"],
+				"first" => ["value" => "恭喜，您已经升为{$member}级会员。", "color" => "#173177"],
 				"keyword1" => ["value" => $user['userName'], "color" => "#173177"],
 				"keyword2" => ["value" => $date, "color" => "#173177"],
 				"remark" => ["value" => "点击查看会员权益", "color" => "#173177"],
@@ -237,5 +236,5 @@ class UserController extends BaseController
 		UserService::updateById($userId, ['payPassword' => password_hash($password, PASSWORD_BCRYPT)]);
 		util::ok();
 	}
-
+	
 }

app/client/controllers/PayController.php

@@ -146,7 +146,7 @@ class PayController extends BaseController
 			}
 		}
 		$userAsset = xhUserAssetService::getByUserId($userId);
-		$level = $userAsset['memberLevel'];
+		$level = $userAsset['member'];
 		if ($level > 0) {
 			$gradeList = xhMerchantExtendService::getGradeList($this->merchantExtend);
 			$discount = $gradeList[$level]['discount'];
@@ -176,7 +176,7 @@ class PayController extends BaseController
 		$prePrice = round($post['prePrice'], 2);//四舍五入，保留二位小数
 		
 		$userAsset = xhUserAssetService::getByUserId($this->userId);
-		$level = isset($userAsset['memberLevel']) ? $userAsset['memberLevel'] : 0;
+		$level = isset($userAsset['member']) ? $userAsset['member'] : 0;
 		$merchantExtend = xhMerchantExtendService::getByMerchantId($this->merchantId);
 		$memberIntegral = xhMerchantExtendService::getGradeList($merchantExtend, 'desc');
 		Yii::info(json_encode($merchantExtend));

app/client/controllers/UserController.php

@@ -73,8 +73,7 @@ class UserController extends BaseController
 		$user = $this->user;
 		if (!empty($user) && !empty($user['mobile'])) {
 			$userId = $user['id'];
-			UserService::updateById($userId, ['isMember' => 1]);
-			UserAssetService::updateByUserId($userId, ['isMember' => 1]);
+			UserAssetService::updateByUserId($userId, ['member' => 0]);
 			util::successInfo('操作成功', 'A0001', ['mobile' => $user['mobile']]);
 		}
 		$cacheKey = 'MINI_SESSION_KEY_' . $miniOpenId;
@@ -133,11 +132,11 @@ class UserController extends BaseController
 		if (stringUtil::isMobile($mobile) == false) {
 			util::fail('请输入手机号');
 		}
-		$user = $this->user;
-		if (isset($user['isMember']) && $user['isMember'] == 1) {
+		$userId = $this->userId;
+		$asset = UserAssetService::getByUserId($userId);
+		if (isset($asset['member']) && $asset['member'] != -1) {
 			util::fail('已经是会员了');
 		}
-		$userId = $this->userId;
 		$code = isset($post['code']) ? $post['code'] : '';
 		$cacheCode = SmsService::getApplyMemberCode($userId);
 		if (empty($cacheCode) || $cacheCode != $code) {
@@ -178,5 +177,5 @@ class UserController extends BaseController
 		$user['userAsset']['nextLevelGrowth'] = $nextLevelGrowth;
 		util::success($user);
 	}
-
+	
 }

app/saas/controllers/UserController.php

@@ -23,7 +23,7 @@ class UserController extends BaseController
 				break;
 			case 2:
 				//会员
-				$where['isMember'] = 1;
+				$where['member>'] = -1;
 				break;
 			default:
 		}
@@ -47,7 +47,7 @@ class UserController extends BaseController
 				break;
 			case 2:
 				//会员
-				$where['isMember'] = 1;
+				$where['member>'] = -1;
 				break;
 			default:
 		}

biz/user/classes/UserClass.php

@@ -88,7 +88,6 @@ class UserClass extends BaseClass
 		$getUserInfo['userName'] = isset($getUserInfo['userName']) ? preg_replace('/[\x{10000}-\x{10FFFF}]/u', '', $getUserInfo['userName']) : '';
 		$getUserInfo['realName'] = isset($getUserInfo['realName']) && !empty($getUserInfo['realName']) ? $getUserInfo['realName'] : '';
 		$getUserInfo['sex'] = isset($getUserInfo['sex']) ? $getUserInfo['sex'] : 0;//未知
-		$getUserInfo['isMember'] = 0;
 		$getUserInfo['identity'] = 0;
 		$subscribe = isset($getUserInfo['subscribe']) ? $getUserInfo['subscribe'] : 0;
 		$getUserInfo['subscribe'] = $subscribe;
@@ -171,10 +170,6 @@ class UserClass extends BaseClass
 		if (isset($getUserInfo['headImgUrl']) && !empty($getUserInfo['headImgUrl'])) {
 			$data['isFull'] = 1;
 		}
-		if (isset($getUserInfo['isMember'])) {
-			$data['isMember'] = $getUserInfo['isMember'];
-			$assetData['isMember'] = $getUserInfo['isMember'];
-		}
 		/**更新头像**/
 		if (isset($originalUser['avatar']) == false || empty($originalUser['avatar'])) {
 			if (isset($getUserInfo['headImgUrl']) && !empty($getUserInfo['headImgUrl'])) {
@@ -249,7 +244,6 @@ class UserClass extends BaseClass
 				'mobile',
 				'password',
 				'payPassword',
-				'isMember',
 				'subscribe',
 				'hasSubscribe',
 				'subscribeTime',
@@ -350,7 +344,7 @@ class UserClass extends BaseClass
 					];
 					xhUserIntegralService::add($integralData);//用户兑换型积分流水增加
 					
-					$preLevel = $retainUserAsset['memberLevel'];
+					$preLevel = $retainUserAsset['member'];
 					$preIntegral = $retainUserAsset['integral'];//可抵用型积分
 					$merchantExtend = xhMerchantExtendService::getByMerchantId($merchantId);
 					UserIntegralService::increaseToUpgrade($preIntegral, $addData['integral'], $preLevel, $retainUserId, $merchantId, $merchantExtend);

biz/user/models/User.php

@@ -2,41 +2,6 @@
 namespace biz\user\models;
 use biz\base\models\Base;
 
-/**
- * This is the model class for table "xhUser".
- *
- * @property int $id
- * @property string $mobile 手机号
- * @property string $avatar 头像
- * @property string $userName 用户的名称，昵称，显示的名字
- * @property string $realName 真实姓名
- * @property int $sex 性别 0未知 1男性2女性
- * @property string $birthday
- * @property string $password 密码
- * @property string $payPassword 支付密码
- * @property string $openId 微信openid
- * @property string $unionId 微信同一个开放平台下（网站应用，公众号等）用户唯一标识
- * @property string $alipayId 支付宝id
- * @property int $isFull 用户信息是否完整 0完整 1不完整，通过扫码付款生成的用户有不完整的情况
- * @property int $merchantId 商户id
- * @property int $isMember 是否会员
- * @property int $isStudent 是否学员
- * @property int $subscribe 是否关注平台 0未关注 1关注
- * @property int $hasSubscribe 关注历史 0没有关注过公众号 1有关注过
- * @property string $tag 标签id列表
- * @property string $province 省
- * @property string $city 市
- * @property string $dist 区县
- * @property string $address 详细街道地址
- * @property string $addLat 纬度
- * @property string $addLong 经度
- * @property string $addPrecision 精度
- * @property int $status 帐户状态 0正常 1冻结
- * @property string $remark 商家对用户的备注信息
- * @property string $createTime 创建时间
- * @property string $updateTime
- * @property int $subscribeTime 关注时间
- */
 class User extends Base
 {
 
@@ -48,65 +13,4 @@ class User extends Base
 		return 'xhUser';
 	}
 
-	/**
-	 * @inheritdoc
-	 */
-	public function rules()
-	{
-		return [
-			[['sex', 'isFull', 'merchantId', 'isMember', 'identity', 'subscribe', 'hasSubscribe', 'status', 'subscribeTime','addTime'], 'integer'],
-			[['birthday', 'createTime', 'updateTime'], 'safe'],
-			[['createTime'], 'required'],
-			[['mobile'], 'string', 'max' => 15],
-			[['avatar'], 'string', 'max' => 200],
-			[['userName', 'realName', 'alipayId'], 'string', 'max' => 50],
-			[['password', 'payPassword'], 'string', 'max' => 64],
-			[['openId', 'unionId'], 'string', 'max' => 100],
-			[['tag'], 'string', 'max' => 500],
-			[['province', 'city', 'dist', 'address', 'addLat', 'addLong', 'addPrecision'], 'string', 'max' => 20],
-			[['remark'], 'string', 'max' => 1000],
-			[['openId'], 'unique'],
-		];
-	}
-	
-	/**
-	 * @inheritdoc
-	 */
-	public function attributeLabels()
-	{
-		return [
-			'id' => 'ID',
-			'mobile' => 'Mobile',
-			'avatar' => 'Avatar',
-			'userName' => 'User Name',
-			'realName' => 'Real Name',
-			'sex' => 'Sex',
-			'birthday' => 'Birthday',
-			'password' => 'Password',
-			'payPassword' => 'Pay Password',
-			'openId' => 'Open ID',
-			'unionId' => 'Union ID',
-			'alipayId' => 'Alipay ID',
-			'isFull' => 'Is Full',
-			'merchantId' => 'Merchant ID',
-			'isMember' => 'Is Member',
-			'identity' => 'identity',
-			'subscribe' => 'Subscribe',
-			'hasSubscribe' => 'Subscribe History',
-			'tag' => 'Tag',
-			'province' => 'Province',
-			'city' => 'City',
-			'dist' => 'Dist',
-			'address' => 'Address',
-			'addLat' => 'Add Lat',
-			'addLong' => 'Add Long',
-			'addPrecision' => 'Add Precision',
-			'status' => 'Status',
-			'addTime' => 'addTime',
-			'remark' => 'remark',
-			'createTime' => 'Create Time',
-			'updateTime' => 'Update Time',
-			'subscribeTime' => 'Subscribe Time',
-		];
-	}
 }

biz/user/models/UserAsset.php

@@ -12,40 +12,4 @@ class UserAsset extends Base
 		return 'xhUserAsset';
 	}
 	
-	/**
-	 * @inheritdoc
-	 */
-	public function rules()
-	{
-		return [
-			[['userId', 'merchantId', 'totalBuyNum', 'integral', 'discount', 'isMember', 'memberLevel'], 'integer'],
-			[['totalExpend', 'totalIncome', 'totalRecharge', 'balance'], 'number'],
-			[['createTime'], 'required'],
-			[['createTime', 'updateTime'], 'safe'],
-			[['userId'], 'unique'],
-		];
-	}
-	
-	/**
-	 * @inheritdoc
-	 */
-	public function attributeLabels()
-	{
-		return [
-			'id' => 'ID',
-			'userId' => 'User ID',
-			'merchantId' => 'Merchant ID',
-			'totalExpend' => 'Total Expend',
-			'totalIncome' => 'Total Income',
-			'totalRecharge' => 'Total Recharge',
-			'totalBuyNum' => 'Total Buy Num',
-			'balance' => 'Balance',
-			'integral' => 'Integral',
-			'discount' => 'Discount',
-			'isMember' => 'Is Member',
-			'memberLevel' => 'Member Level',
-			'createTime' => 'Create Time',
-			'updateTime' => 'Update Time',
-		];
-	}
 }

biz/user/services/UserIntegralService.php

@@ -42,8 +42,7 @@ class UserIntegralService extends BaseService
 		if (empty($gainLevel)) {//会员积分达到新等级
 			return ['status' => false, 'msg' => '没有升级'];
 		}
-		xhUserService::updateById($userId, ['isMember' => 1]);
-		xhUserAssetService::updateByUserId($userId, ['memberLevel' => $gainLevel, 'isMember' => 1]);
+		xhUserAssetService::updateByUserId($userId, ['member' => $gainLevel]);
 
 		$allTM = xhTMessageService::getList($merchantId);//积分变动通知
 		$shortTempId = 'OPENTM205211943';

biz/user/services/UserOldDataService.php

@@ -62,7 +62,7 @@ class UserOldDataService extends BaseService
 		$adminId	= $merchant['adminId'];
 		if(!empty($addIntegral)){
 			$preIntegral			= $userAsset['integral'];
-			$preLevel = $userAsset['memberLevel'];
+			$preLevel = $userAsset['member'];
 			$integral = stringUtil::calcAdd($preIntegral,$addIntegral);
 			$merchantExtend = xhMerchantExtendService::getByMerchantId($merchantId);
 

biz/user/services/UserService.php

@@ -241,10 +241,8 @@ class UserService extends BaseService
 	//升级成为会员，并更新用户相关信息 shish 2019.9.7
 	public static function upgradeToMember($userId, $merchantId, $data = [])
 	{
-		$data['isMember'] = 1;
 		self::updateById($userId, $data);
-		UserAssetService::updateByUserId($userId, ['isMember' => 1]);
-		
+
 		/**会员数+1**/
 		MerchantAssetService::addMemberNum($merchantId);
 	}

common/models/xhUser.php

@@ -2,110 +2,13 @@
 
 namespace common\models;
 
-/**
- * This is the model class for table "xhUser".
- *
- * @property int $id
- * @property string $mobile 手机号
- * @property string $avatar 头像
- * @property string $userName 用户的名称，昵称，显示的名字
- * @property string $realName 真实姓名
- * @property int $sex 性别 0未知 1男性2女性
- * @property string $birthday
- * @property string $password 密码
- * @property string $payPassword 支付密码
- * @property string $openId 微信openid
- * @property string $unionId 微信同一个开放平台下（网站应用，公众号等）用户唯一标识
- * @property string $alipayId 支付宝id
- * @property int $isFull 用户信息是否完整 0完整 1不完整，通过扫码付款生成的用户有不完整的情况
- * @property int $merchantId 商户id
- * @property int $isMember 是否会员
- * @property int $subscribe 是否关注平台 0未关注 1关注
- * @property int $hasSubscribe 关注历史 0没有关注过公众号 1有关注过
- * @property string $tag 标签id列表
- * @property string $province 省
- * @property string $city 市
- * @property string $dist 区县
- * @property string $address 详细街道地址
- * @property string $addLat 纬度
- * @property string $addLong 经度
- * @property string $addPrecision 精度
- * @property int $status 帐户状态 0正常 1冻结
- * @property string $remark 商家对用户的备注信息
- * @property string $createTime 创建时间
- * @property string $updateTime
- * @property int $subscribeTime 关注时间
- */
+
 class xhUser extends xhBaseModel
 {
-    /**
-     * @inheritdoc
-     */
+
     public static function tableName()
     {
         return 'xhUser';
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['sex', 'isFull', 'merchantId', 'isMember','source', 'identity', 'subscribe', 'hasSubscribe', 'status', 'subscribeTime','addTime'], 'integer'],
-            [['birthday', 'createTime', 'updateTime'], 'safe'],
-            [['createTime'], 'required'],
-            [['mobile'], 'string', 'max' => 15],
-            [['avatar'], 'string', 'max' => 200],
-            [['userName', 'realName', 'alipayId'], 'string', 'max' => 50],
-            [['password', 'payPassword'], 'string', 'max' => 64],
-            [['openId','miniOpenId', 'unionId'], 'string', 'max' => 100],
-            [['tag'], 'string', 'max' => 500],
-            [['province', 'city', 'dist', 'address', 'addLat', 'addLong', 'addPrecision'], 'string', 'max' => 20],
-            [['remark'], 'string', 'max' => 1000],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-            'id' => 'ID',
-            'mobile' => 'Mobile',
-            'avatar' => 'Avatar',
-            'userName' => 'User Name',
-            'realName' => 'Real Name',
-            'sex' => 'Sex',
-            'birthday' => 'Birthday',
-            'password' => 'Password',
-            'payPassword' => 'Pay Password',
-            'openId' => 'Open ID',
-            'unionId' => 'Union ID',
-            'alipayId' => 'Alipay ID',
-            'isFull' => 'Is Full',
-            'merchantId' => 'Merchant ID',
-            'isMember' => 'Is Member',
-            'identity' => 'identity',
-	        'miniOpenId' => 'miniOpenId',
-            'subscribe' => 'Subscribe',
-            'hasSubscribe' => 'has Subscribe',
-            'tag' => 'Tag',
-            'province' => 'Province',
-            'city' => 'City',
-            'dist' => 'Dist',
-            'address' => 'Address',
-            'addLat' => 'Add Lat',
-            'addLong' => 'Add Long',
-            'addPrecision' => 'Add Precision',
-            'status' => 'Status',
-	        'source' => 'source',
-	        'addTime' => 'addTime',
-            'remark' => 'Remark',
-            'createTime' => 'Create Time',
-            'updateTime' => 'Update Time',
-            'subscribeTime' => 'Subscribe Time',
-        ];
-    }
 }

common/models/xhUserAsset.php

@@ -2,77 +2,12 @@
 
 namespace common\models;
 
-/**
- * This is the model class for table "xhUserAsset".
- *
- * @property int $id
- * @property int $userId 用户id
- * @property int $merchantId 商家id
- * @property string $totalExpend 累计消费
- * @property string $totalIncome 累计收入
- * @property string $totalRecharge 累计充值
- * @property int $totalBuyNum 已经付款购买的数量
- * @property string $balance 余额
- * @property int $integral 可兑换型积分余额
- * @property int $point 升级型积分余额
- * @property int $discount 折扣
- * @property string $uniqueCode 用户唯一编码
- * @property string $uniqueQrCode 二维码地址
- * @property int $isMember 0普通用户 1会员
- * @property int $memberLevel 会员等级 0普通用户 1会员一级
- * @property string $createTime 创建时间
- * @property string $updateTime
- */
 class xhUserAsset extends xhBaseModel
 {
-    /**
-     * @inheritdoc
-     */
+
     public static function tableName()
     {
         return 'xhUserAsset';
     }
 
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['userId', 'merchantId', 'totalBuyNum', 'integral', 'point', 'discount', 'isMember', 'memberLevel'], 'integer'],
-            [['totalExpend', 'totalIncome', 'totalRecharge', 'balance'], 'number'],
-            [['createTime'], 'required'],
-            [['createTime', 'updateTime'], 'safe'],
-            [['uniqueCode'], 'string', 'max' => 100],
-            [['uniqueQrCode'], 'string', 'max' => 200],
-            [['uniqueCode'], 'unique'],
-            [['userId'], 'unique'],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-            'id' => 'ID',
-            'userId' => 'User ID',
-            'merchantId' => 'Merchant ID',
-            'totalExpend' => 'Total Expend',
-            'totalIncome' => 'Total Income',
-            'totalRecharge' => 'Total Recharge',
-            'totalBuyNum' => 'Total Buy Num',
-            'balance' => 'Balance',
-            'integral' => 'Integral',
-            'point' => 'Point',
-            'discount' => 'Discount',
-            'uniqueCode' => 'Unique Code',
-            'uniqueQrCode' => 'Unique Qr Code',
-            'isMember' => 'Is Member',
-            'memberLevel' => 'Member Level',
-            'createTime' => 'Create Time',
-            'updateTime' => 'Update Time',
-        ];
-    }
 }

common/services/xhUserAssetService.php

@@ -45,7 +45,7 @@ class xhUserAssetService
 		$orderId = $order['id'];
 		$openId = $user['openId'];
 		$integral = isset($upAssetData['integral']) ? $upAssetData['integral'] : 0;
-		$preLevel = $userAsset['memberLevel'];
+		$preLevel = $userAsset['member'];
 		$preIntegral = $userAsset['integral'];
 		$addIntegral = stringUtil::calcSub($integral, $preIntegral);
 

common/services/xhUserService.php

@@ -98,7 +98,6 @@ class xhUserService
 		$data['openId'] = $openId;
 		$data['miniOpenId'] = isset($getUserInfo['miniOpenId']) ? $getUserInfo['miniOpenId'] : '';
 		$data['unionId'] = isset($getUserInfo['unionid']) ? $getUserInfo['unionid'] : '';
-		$data['isMember'] = 0;
 		$data['identity'] = 0;
 		$subscribe = isset($getUserInfo['subscribe']) ? $getUserInfo['subscribe'] : 0;
 		$data['subscribe'] = $subscribe;

sql.txt

@@ -1,3 +1,10 @@
+2019.12.29 shish 会员 这个需要特别注意国兰数据迁移问题！！！！
+ALTER TABLE `xhUserAsset` MODIFY `memberLevel` SMALLINT NOT NULL DEFAULT -1 COMMENT '会员等级 -1普通用户 0普通会员，登记了手机号 1 一级会员';
+ALTER TABLE `xhUserAsset` CHANGE `memberLevel` `member` SMALLINT NOT NULL DEFAULT -1 COMMENT '会员等级 -1普通用户 0普通会员，登记了手机号 1 一级会员';
+ALTER TABLE `xhUserAsset` DROP COLUMN `isMember`;
+ALTER TABLE `xhUser` DROP COLUMN `isMember`;
+ALTER TABLE `xhUser` ADD `member` SMALLINT NOT NULL DEFAULT -1 COMMENT '会员等级 -1普通用户 0普通会员，登记了手机号 1 一级会员' AFTER `source`;
+
 2019.12.27 shish 充值相关
 ALTER TABLE `xhRecharge` DROP COLUMN `id`;
 ALTER TABLE `xhRecharge` ADD id INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST;