shish 6 роки тому
батько
коміт
275932c077

+ 2 - 30
app/mobile/controllers/CenterController.php

@@ -92,40 +92,12 @@ class CenterController extends MobileendController
 	 */
 	public function actionQrCode()
 	{
-		$get = Yii::$app->request->get();
-		$userAsset = xhUserAssetService::getByUserId($this->userId);
-		$uniqueQrCode = $userAsset['uniqueQrCode'];
-		$userId = $this->userId;
-		$string = configDict::getQrKey('user') . $userId;
-		$webRoot = Yii::getAlias('@webroot') . '/../../../../resource/images/';
-		if (empty($uniqueQrCode) || file_exists($webRoot . $uniqueQrCode) == false) {
-			$logo = !empty($this->merchant['logo']) ? $webRoot . $this->merchant['logo'] : '';
-			$uniqueQrCode = qrCodeUtil::card($string, '', $logo);
-			xhUserAssetService::updateByUserId($this->userId, ['uniqueQrCode' => $uniqueQrCode]);
-		}
-		//正在呼叫
-		$discount = '';
-		if (!empty($userAsset) && $userAsset['isMember'] == 1) {
-			$gradeList = xhMerchantExtendService::getGradeList($this->merchantExtend, 'desc');
-			$level = $userAsset['memberLevel'];
-			$discount = $gradeList[$level]['discount'];
-		}
-		return $this->render('qrCode', ['uniqueQrCode' => $uniqueQrCode, 'userAsset' => $userAsset, 'user' => $this->user, 'discount' => $discount]);
+
 	}
 	
 	public function actionStudentCard()
 	{
-		$student = xhTrainStudentService::getByUserId($this->userId);
-		$uniqueQrCode = $userAsset['uniqueQrCode'];
-		$string = configDict::getQrKey('xhStudent') . $this->userId;
-		$unique = $string;
-		if (empty($uniqueQrCode)) {
-			$webRoot = Yii::getAlias('@webroot') . '/../../../resource/images/';
-			$logo = !empty($this->merchant['logo']) ? $webRoot . $this->merchant['logo'] : '';
-			$uniqueQrCode = qrCodeUtil::generate($string, $unique, $logo);
-			xhTrainStudentService::updateByUserId($this->userId, ['uniqueQrCode' => $uniqueQrCode]);
-		}
-		return $this->render('studentCard', ['uniqueQrCode' => $uniqueQrCode, 'student' => $student, 'user' => $this->user]);
+
 	}
 	
 	/**

+ 0 - 37
app/mobile/controllers/ZoneController.php

@@ -23,41 +23,4 @@ class ZoneController extends MobileendController{
 
 	public $withoutLogin = [];//游客可以访问的方法
 
-	/**
-	 * 用户二维码
-	 */
-	public function actionMemberQrCode()
-	{
-		$this->layout		= 'centerMain';
-		$get 				= Yii::$app->request->get();
-		$uniqueCode			= isset($get['uniqueCode']) ? $get['uniqueCode'] : '';
-		$userAsset			= xhUserAsset::getByCondition(['uniqueCode' => $uniqueCode]);
-		if(empty($userAsset)){
-			util::stop('无效二维码');
-		}
-		$userId			= $userAsset['userId'];
-		$user			= xhUserService::getById($userId);
-		return $this->render('memberQrCode',['userAsset' => $userAsset,'user' => $user]);
-	}
-
-	/**
-	 * 扫二维码显示的信息
-	 */
-	public function actionUserInfo()
-	{
-		$this->layout	= 'centerMain';
-		$get			= Yii::$app->request->get();
-		$uniqueCode 	= isset($get['uniqueCode']) ? $get['uniqueCode'] : '';
-		$userAsset		= xhUserAsset::getByCondition(['uniqueCode' => $uniqueCode]);
-		$userId			= $userAsset->userId;
-		$user			= xhUserService::getById($userId);
-		if(empty($userAsset)){
-			util::stop('无效二维哦');
-		}
-		$mi			= configDict::getConfig('memberIntegral');
-		$level		= $userAsset->memberLevel;
-		$levelInfo	= $mi[$level];
-		$discount	= $levelInfo['discountName'];
-		return $this->render('userInfo',['user' => $user,'level' => $level,'discount' =>$discount]);
-	}
 }

+ 3 - 3
app/mobile/views/center/qrCode.php

@@ -65,7 +65,7 @@
 <div class="spmc1">
 	<div style="margin-top:10px;">
 		<div class="img-thumbnail">
-			<img src="/images/newGrey.gif" class="lazy" data-original="<?= Yii::$app->params['imgUrl'].$uniqueQrCode ?>" style="width:50%;margin:0 auto;display:block;" />
+		
 <?php if(empty($user['subscribe'])){ ?>
 	<div style="font-size:14px;text-align:center;padding:10px; 0 5px 0;">关注公众号并登记会员信息,可查看积分哦</div>
 <?php }else{ ?>
@@ -120,8 +120,8 @@ $("div[name=shareMask]").click(function(){
    	//微信分享
 	var shareTitle = '<?= $this->context->userName.'的二维码' ?>';
 	var descContent = '出示此二维码,在<?php echo $this->context->merchant['merchantName'] ?>消费,享受优惠';
-	var lineLink = '<?= Yii::$app->params['frontUrl'] ?>/zone/member-qr-code?uniqueCode=<?= $userAsset['uniqueCode'] ?>&account=<?= $_GET['account'] ?>&weixinShare=yes';
-	var imgUrl = '<?= Yii::$app->params['imgUrl'].$userAsset['uniqueQrCode'] ?>';
+	var lineLink = '';
+	var imgUrl = '';
 	wx.config({
     debug:false,
   	 appId: '<?= $this->context->signPackage['appId'] ?>',

+ 0 - 1
app/mobile/views/center/studentCard.php

@@ -124,7 +124,6 @@
 <div class="spmc1">
 	<div style="margin-top:10px;">
 		<div class="img-thumbnail">
-			<img src="/images/newGrey.gif" class="lazy" data-original="<?= Yii::$app->params['imgUrl'].$uniqueQrCode ?>" style="width:50%;margin:0 auto;display:block;" />
 			<div style="font-size:14px;text-align:center;padding:10px; 0 5px 0;"><?php if(!empty($student)){ ?>积分:<?= $student['integral'] ?><?php }else{ echo '您还没有报名哦~'; } ?></div>
 		</div>
 		<br />

+ 1 - 1
app/mobile/views/zone/memberQrCode.php

@@ -42,7 +42,7 @@
 <br /><br />
 <div>
 	<div class="img-thumbnail">
-		<img src="<?= Yii::$app->params['imgUrl'].$userAsset['uniqueQrCode'] ?>" style="display:block;margin:0 auto;width:60%;border-radius:15px;" />
+
 	</div>
 	<br /><br />
 	<p align="center"><?= $user['userName'] ?>的二维码</p>

+ 0 - 21
biz/merchant/models/MerchantAsset.php

@@ -2,27 +2,6 @@
 namespace biz\merchant\models;
 use biz\base\models\Base;
 
-/**
- * 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 MerchantAsset extends Base
 {
 	/**

+ 2 - 4
biz/user/classes/UserClass.php

@@ -111,10 +111,8 @@ class UserClass extends BaseClass
 		if (empty($user['userName'])) {
 			self::updateById($userId, ['userName' => $userId]);
 		}
-		
-		$random = Yii::$app->getSecurity()->generateRandomString();//yii2 里生成32位唯一随机数
-		$uniqueCode = $userId . $random;
-		$assetData = ['userId' => $userId, 'merchantId' => $merchantId, 'createTime' => $date, 'uniqueCode' => $uniqueCode];
+
+		$assetData = ['userId' => $userId, 'merchantId' => $merchantId, 'createTime' => $date];
 		//生成用户资产信息
 		UserAssetClass::add($assetData);
 		

+ 0 - 26
biz/user/models/UserAsset.php

@@ -2,27 +2,6 @@
 namespace biz\user\models;
 use biz\base\models\Base;
 
-/**
- * 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 UserAsset extends Base
 {
 	/**
@@ -43,9 +22,6 @@ class UserAsset extends Base
 			[['totalExpend', 'totalIncome', 'totalRecharge', 'balance'], 'number'],
 			[['createTime'], 'required'],
 			[['createTime', 'updateTime'], 'safe'],
-			[['uniqueCode'], 'string', 'max' => 100],
-			[['uniqueQrCode'], 'string', 'max' => 200],
-			[['uniqueCode'], 'unique'],
 			[['userId'], 'unique'],
 		];
 	}
@@ -67,8 +43,6 @@ class UserAsset extends Base
 			'integral' => 'Integral',
 			'point' => 'Point',
 			'discount' => 'Discount',
-			'uniqueCode' => 'Unique Code',
-			'uniqueQrCode' => 'Unique Qr Code',
 			'isMember' => 'Is Member',
 			'memberLevel' => 'Member Level',
 			'createTime' => 'Create Time',

+ 1 - 22
common/models/xhTrainStudent.php

@@ -2,26 +2,6 @@
 
 namespace common\models;
 
-/**
- * This is the model class for table "xhTrainStudent".
- *
- * @property int $id 自增id
- * @property int $userId 用户id
- * @property int $merchantId
- * @property string $uniqueQrCode 二维码地址
- * @property string $avatar 学员头像,方便老师认人
- * @property int $registerTime 报名时间
- * @property int $classId 报名班级
- * @property int $praiseNum 集赞数量
- * @property int $learnStatus 0学习中 1毕业 2退学
- * @property int $point 升级型积分
- * @property int $integral 可兑换型积分
- * @property int $lesson 节课数
- * @property string $className 课名
- * @property string $tuition 学费
- * @property int $addTime 创建时间
- * @property int $modTime 修改时间
- */
 class xhTrainStudent extends xhBaseModel
 {
     /**
@@ -40,7 +20,7 @@ class xhTrainStudent extends xhBaseModel
         return [
             [['userId', 'merchantId', 'registerTime', 'classId', 'praiseNum', 'learnStatus', 'point', 'integral', 'lesson', 'addTime', 'modTime'], 'integer'],
             [['tuition'], 'number'],
-            [['uniqueQrCode', 'avatar'], 'string', 'max' => 200],
+            [['avatar'], 'string', 'max' => 200],
             [['className'], 'string', 'max' => 30],
         ];
     }
@@ -54,7 +34,6 @@ class xhTrainStudent extends xhBaseModel
             'id' => 'ID',
             'userId' => 'User ID',
             'merchantId' => 'Merchant ID',
-            'uniqueQrCode' => 'Unique Qr Code',
             'avatar' => 'Avatar',
             'registerTime' => 'Register Time',
             'classId' => 'Class ID',

+ 0 - 26
common/models/xhUserAsset.php

@@ -2,27 +2,6 @@
 
 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
 {
     /**
@@ -43,9 +22,6 @@ class xhUserAsset extends xhBaseModel
             [['totalExpend', 'totalIncome', 'totalRecharge', 'balance'], 'number'],
             [['createTime'], 'required'],
             [['createTime', 'updateTime'], 'safe'],
-            [['uniqueCode'], 'string', 'max' => 100],
-            [['uniqueQrCode'], 'string', 'max' => 200],
-            [['uniqueCode'], 'unique'],
             [['userId'], 'unique'],
         ];
     }
@@ -67,8 +43,6 @@ class xhUserAsset extends xhBaseModel
             'integral' => 'Integral',
             'point' => 'Point',
             'discount' => 'Discount',
-            'uniqueCode' => 'Unique Code',
-            'uniqueQrCode' => 'Unique Qr Code',
             'isMember' => 'Is Member',
             'memberLevel' => 'Member Level',
             'createTime' => 'Create Time',

+ 3 - 3
common/services/xhUserService.php

@@ -126,9 +126,9 @@ class xhUserService
 			if (empty($nickname)) {
 				self::updateById($userId, ['userName' => $userId]);
 			}
-			$random = Yii::$app->getSecurity()->generateRandomString();//yii2 里生成32位唯一随机数
-			$uniqueCode = $userId . $random;
-			$assetData = ['userId' => $userId, 'merchantId' => $merchantId, 'createTime' => $date, 'uniqueCode' => $uniqueCode];
+			
+			
+			$assetData = ['userId' => $userId, 'merchantId' => $merchantId, 'createTime' => $date];
 			xhUserAssetService::add($userId, $assetData);
 		}
 		

+ 3 - 0
sql.txt

@@ -2,6 +2,9 @@
 ALTER TABLE `xhUser` ADD INDEX mobile(merchantId,`mobile`);
 ALTER TABLE xhUserAsset DROP COLUMN `point`;
 ALTER TABLE xhUserAsset MODIFY `integral` INT NOT NULL DEFAULT 0 COMMENT '积分';
+ALTER TABLE xhUser MODIFY birthday DATE NOT NULL DEFAULT '0000-00-00' COMMENT '生日';
+ALTER TABLE xhUserAsset DROP COLUMN `uniqueQrCode`;
+ALTER TABLE xhUserAsset DROP COLUMN `uniqueCode`;
 
 shish 2019.11.30
 ALTER TABLE xhGoods DROP COLUMN `multiPrice`;