商家备注

app/business/controllers/UserController.php

@@ -6,6 +6,7 @@ use biz\admin\services\AdminService;
 use biz\merchant\services\MerchantExtendService;
 use biz\user\services\UserAssetService;
 use biz\user\services\UserIntegralService;
+use biz\user\services\UserRemarkService;
 use biz\user\services\UserService;
 use common\components\weixinUtil;
 use common\services\xhMerchantExtendService;
@@ -60,12 +61,14 @@ class UserController extends BaseController
 		util::success($info);
 	}
 	
-	//获取客户基本、资产和订单完整信息 2019.11.30
-	public function actionFullDetail()
+	//获取客户详情，包括基本信息、资产、订单和备注 2019.11.30
+	public function actionUserDetail()
 	{
 		$userId = Yii::$app->request->get('userId');
 		$info = UserService::getFullUserInfo($userId);
 		UserService::valid($info, $this->merchantId);
+		$list = UserRemarkService::getRemarkList($userId);
+		$info['remarkList'] = $list;
 		util::success($info);
 	}
 	

app/business/controllers/UserRemarkController.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace business\controllers;
+
+use biz\user\services\UserRemarkService;
+use Yii;
+
+class UserRemarkController extends BaseController
+{
+	//删除备注
+	public function actionDelete()
+	{
+		$id = Yii::$pp->request->get('id');
+		$remark = UserRemarkService::getBYId($id);
+		UserRemarkService::check($remark,$this->userId);
+	}
+	
+}

biz/merchant/classes/MerchantRemarkClass.php

@@ -0,0 +1,12 @@
+<?php
+namespace biz\user\classes;
+
+use Yii;
+use biz\base\classes\BaseClass;
+
+class MerchantRemarkClass extends BaseClass
+{
+
+	public static $baseFile = '\biz\user\models\MerchantRemark';
+
+}

biz/merchant/models/merchantRemark.php

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

biz/merchant/services/MerchantRemarkService.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace biz\user\services;
+
+use biz\base\services\BaseService;
+use biz\user\classes\MerchantRemarkClass;
+use Yii;
+use common\components\weixinUtil;
+
+class MerchantRemarkService extends BaseService
+{
+	
+	public static $baseFile = '\biz\user\classes\MerchantRemarkClass';
+	
+	public static function getRemarkList($userId)
+	{
+		return MerchantRemarkClass::getAllByCondition(['userId' => $userId], null, '*');
+	}
+	
+}

biz/user/classes/UserRemarkClass.php

@@ -0,0 +1,12 @@
+<?php
+namespace biz\user\classes;
+
+use Yii;
+use biz\base\classes\BaseClass;
+
+class UserRemarkClass extends BaseClass
+{
+
+	public static $baseFile = '\biz\user\models\UserRemark';
+
+}

biz/user/models/UserRemark.php

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

biz/user/services/UserRemarkService.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace biz\user\services;
+
+use biz\base\services\BaseService;
+use biz\user\classes\UserRemarkClass;
+use Yii;
+use common\components\weixinUtil;
+
+class UserRemarkService extends BaseService
+{
+	
+	public static $baseFile = '\biz\user\classes\UserRemarkClass';
+	
+	public static function getRemarkList($userId)
+	{
+		return UserRemarkClass::getAllByCondition(['userId' => $userId], null, '*');
+	}
+	
+}

sql.txt

@@ -2,6 +2,15 @@
 ALTER TABLE `xhWxMenu` MODIFY `replyType` TINYINT NOT NULL DEFAULT 0 COMMENT '回复给粉丝的类型 0跳转链接 1文字 2单图文';
 ALTER TABLE `xhWxMenu` DROP COLUMN `targetId`;
 ALTER TABLE `xhWxMenu` ADD targetId INT NOT NULL DEFAULT 0 COMMENT '常用链接的目标id，活动目标id' AFTER `hasSonMenu`;
+CREATE TABLE `xhUserRemark`(
+id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
+userId INT NOT NULL DEFAULT 0 COMMENT '用户id',
+merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
+remark VARCHAR(200) NOT NULL DEFAULT '' COMMENT '备注',
+`addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间'
+)COMMENT='用户备注';
+ALTER TABLE `xhUserRemark` ADD INDEX `userId`(`userId`);
+RENAME TABLE xhUserRemark TO xhMerchantRemark;
 
 2019.12.18 shish 新人优惠券
 DROP TABLE IF EXISTS `xhCouponAsset`;