Browse Source

添加客户

shish 6 years ago
parent
commit
f368df413d

+ 0 - 1
app/business/controllers/BaseController.php

@@ -34,7 +34,6 @@ class BaseController extends PublicController
 		if (empty($adminId)) {
 		if (empty($adminId)) {
 			$this->validate = false;
 			$this->validate = false;
 		}
 		}
-		
 		//方法开放设置 shizq 2019-12-05
 		//方法开放设置 shizq 2019-12-05
 		if (in_array($action->id, $this->notAllowActions)) {
 		if (in_array($action->id, $this->notAllowActions)) {
 			util::fail($action->id . ' not allow');
 			util::fail($action->id . ' not allow');

+ 4 - 4
biz/merchant/classes/MerchantAssetClass.php

@@ -2,7 +2,7 @@
 
 
 namespace biz\merchant\classes;
 namespace biz\merchant\classes;
 
 
-use biz\stat\classes\StatUserByDayClass;
+use biz\stat\classes\StatUserClass;
 use common\components\util;
 use common\components\util;
 use Yii;
 use Yii;
 use biz\base\classes\BaseClass;
 use biz\base\classes\BaseClass;
@@ -13,7 +13,7 @@ class MerchantAssetClass extends BaseClass
 	public static $baseFile = '\biz\merchant\models\MerchantAsset';
 	public static $baseFile = '\biz\merchant\models\MerchantAsset';
 	
 	
 	//客户和粉丝数+1,$type 1只加客 2只加粉丝 3既加客也加粉丝 shish 2019.9.7
 	//客户和粉丝数+1,$type 1只加客 2只加粉丝 3既加客也加粉丝 shish 2019.9.7
-	public static function addCustomerFasNum($merchantId, $type = 1)
+	public static function addUserNum($merchantId, $type = 1)
 	{
 	{
 		$asset = self::getByMerchantId($merchantId, true);
 		$asset = self::getByMerchantId($merchantId, true);
 		if ($type == 2) {
 		if ($type == 2) {
@@ -29,7 +29,7 @@ class MerchantAssetClass extends BaseClass
 		$asset->save();
 		$asset->save();
 		
 		
 		/**每天统计数量+1**/
 		/**每天统计数量+1**/
-		StatUserByDayClass::increaseOne($merchantId, $asset, $type);
+		StatUserClass::increaseOne($merchantId, $asset, $type);
 		
 		
 	}
 	}
 	
 	
@@ -40,7 +40,7 @@ class MerchantAssetClass extends BaseClass
 		$asset->totalFans -= 1;
 		$asset->totalFans -= 1;
 		$asset->save();
 		$asset->save();
 		/**每日统计数量减少**/
 		/**每日统计数量减少**/
-		StatUserByDayClass::decreaseOneFans($merchantId, $asset);
+		StatUserClass::decreaseOneFans($merchantId, $asset);
 	}
 	}
 	
 	
 	//获取商家资产信息 shish 2019.9.7
 	//获取商家资产信息 shish 2019.9.7

+ 2 - 2
biz/merchant/services/MerchantAssetService.php

@@ -18,9 +18,9 @@ class MerchantAssetService extends BaseService
 	}
 	}
 	
 	
 	//客户和粉丝数+1,$type 1只加客 2只加粉丝 3既加客也加粉丝 shish 2019.9.7
 	//客户和粉丝数+1,$type 1只加客 2只加粉丝 3既加客也加粉丝 shish 2019.9.7
-	public static function addCustomerFasNum($merchantId, $type = 1)
+	public static function addUserNum($merchantId, $type = 1)
 	{
 	{
-		MerchantAssetClass::addCustomerFasNum($merchantId, $type);
+		MerchantAssetClass::addUserNum($merchantId, $type);
 	}
 	}
 	
 	
 	//减少粉丝数 shish 2019.9.7
 	//减少粉丝数 shish 2019.9.7

+ 2 - 2
biz/stat/classes/StatUserByDayClass.php → biz/stat/classes/StatUserClass.php

@@ -5,10 +5,10 @@ namespace biz\stat\classes;
 use Yii;
 use Yii;
 use biz\base\classes\BaseClass;
 use biz\base\classes\BaseClass;
 
 
-class StatUserByDayClass extends BaseClass
+class StatUserClass extends BaseClass
 {
 {
 	
 	
-	public static $baseFile = '\biz\stat\models\StatUserByDay';
+	public static $baseFile = '\biz\stat\models\StatUser';
 	
 	
 	/**
 	/**
 	 * 客户和粉丝数+1,$type 1只加客 2只加粉丝 3既加客也加粉丝 shish 2019.9.7
 	 * 客户和粉丝数+1,$type 1只加客 2只加粉丝 3既加客也加粉丝 shish 2019.9.7

+ 2 - 2
biz/stat/models/StatUserByDay.php → biz/stat/models/StatUser.php

@@ -2,12 +2,12 @@
 namespace biz\stat\models;
 namespace biz\stat\models;
 use biz\base\models\Base;
 use biz\base\models\Base;
 
 
-class StatUserByDay extends Base
+class StatUser extends Base
 {
 {
 
 
 	public static function tableName()
 	public static function tableName()
 	{
 	{
-		return 'xhStatUserByDay';
+		return 'xhStatUser';
 	}
 	}
 
 
 }
 }

+ 2 - 2
biz/stat/services/StatUserByDayService.php → biz/stat/services/StatUserService.php

@@ -5,10 +5,10 @@ namespace biz\stat\services;
 use biz\base\services\BaseService;
 use biz\base\services\BaseService;
 use Yii;
 use Yii;
 
 
-class StatUserByDayService extends BaseService
+class StatUserService extends BaseService
 {
 {
 	
 	
-	public static $baseFile = '\biz\stat\classes\StatUserByDayClass';
+	public static $baseFile = '\biz\stat\classes\StatUserClass';
 	
 	
 	public static function getTodayNum()
 	public static function getTodayNum()
 	{
 	{

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

@@ -135,7 +135,7 @@ class UserClass extends BaseClass
 		
 		
 		//商家客户粉丝 +1
 		//商家客户粉丝 +1
 		$type = $subscribe == 1 ? 3 : 1;
 		$type = $subscribe == 1 ? 3 : 1;
-		MerchantAssetClass::addCustomerFasNum($merchantId, $type);
+		MerchantAssetClass::addUserNum($merchantId, $type);
 		return $user;
 		return $user;
 	}
 	}
 	
 	
@@ -189,7 +189,7 @@ class UserClass extends BaseClass
 		
 		
 		/**商家增加粉丝**/
 		/**商家增加粉丝**/
 		if (isset($originalUser['subscribe']) && $originalUser['subscribe'] == 0 && isset($getUserInfo['subscribe']) && $getUserInfo['subscribe'] == 1) {
 		if (isset($originalUser['subscribe']) && $originalUser['subscribe'] == 0 && isset($getUserInfo['subscribe']) && $getUserInfo['subscribe'] == 1) {
-			MerchantAssetClass::addCustomerFasNum($merchantId, 2);
+			MerchantAssetClass::addUserNum($merchantId, 2);
 		}
 		}
 		
 		
 		//更新访问时间
 		//更新访问时间

+ 2 - 2
biz/user/services/UserService.php

@@ -293,9 +293,9 @@ class UserService extends BaseService
 		//merchantId $source $realName $member $growth $balance $mobile
 		//merchantId $source $realName $member $growth $balance $mobile
 		//必传参数
 		//必传参数
 		validate::easyCheck(['merchantId', 'mobile'], $data);
 		validate::easyCheck(['merchantId', 'mobile'], $data);
-
+		
 		$merchantId = $data['merchantId'];
 		$merchantId = $data['merchantId'];
-		$source = isset($data['source']) ? $data['source'] : 0;
+		$source = isset($data['source']) ? $data['source'] : 'official';
 		$mobile = $data['mobile'];
 		$mobile = $data['mobile'];
 		$realName = isset($data['realName']) ? $data['realName'] : $mobile;
 		$realName = isset($data['realName']) ? $data['realName'] : $mobile;
 		$member = isset($data['member']) ? $data['member'] : -1;
 		$member = isset($data['member']) ? $data['member'] : -1;