测试生成头像

app/client/controllers/OrderController.php

@@ -242,6 +242,7 @@ class OrderController extends BaseController
 		//验证门店是否有效
 		$shopInfo = ShopService::getById($shopId);
 		ShopService::valid($shopInfo, $this->merchantId);
+		//来源 0微信 1支付宝 2小程序 3朋友圈 4美团
 		$sourceType = 3;
 		$post['userId'] = $this->userId;
 		$prePrice = round($post['prePrice'], 2);

biz/user/classes/UserClass.php

@@ -130,11 +130,11 @@ class UserClass extends BaseClass
 		if (isset($getUserInfo['headImgUrl']) && !empty($getUserInfo['headImgUrl'])) {
 			if (empty($preUser) || (isset($preUser['avatar']) && empty($preUser['avatar']))) {
 				$imgUrl = $getUserInfo['headImgUrl'];
-//				$name = ImageService::generateAvatar($merchantId, $imgUrl);
-//				self::updateById($userId, ['avatar' => $name]);
+				$name = ImageService::generateAvatar($merchantId, $imgUrl);
+				self::updateById($userId, ['avatar' => $name]);
 			}
 		}
-		
+
 		//商家客户粉丝 +1
 		$type = $subscribe == 1 ? 3 : 1;
 		MerchantAssetClass::addUserNum($merchantId, $type);

common/services/ImageService.php

@@ -26,11 +26,11 @@ class ImageService
 		$fileName = $middle . $name;
 		$curl = new curl\Curl();
 		$result = $curl->get($url);
-		
+
 		$fp = @fopen($fullFileName, 'a');
 		fwrite($fp, $result);
 		fclose($fp);
-		
+
 		$imgInfo = getimagesize($fullFileName);
 		$width = $imgInfo[0];
 		$height = $imgInfo[1];
@@ -43,9 +43,7 @@ class ImageService
 			$smallHeight = $height;
 		}
 		$smallFullPathFile = $path . $middleName . '_small.' . '.jpg';
-		//暂时注释 shish 2020.1.19
-		//Image::thumbnail($fullFileName, $smallWidth, $smallHeight)->save($smallFullPathFile, ['quality' => 100]);
-		
+		Image::thumbnail($fullFileName, $smallWidth, $smallHeight)->save($smallFullPathFile, ['quality' => 100]);
 		return $fileName;
 	}
 	

console/controllers/UpgradeController.php

@@ -1151,12 +1151,12 @@ update xhMerchant set merchantName='花店宝' where id=12358;update xhShop set
 			WxMenuService::deleteByCondition(['merchantId' => 12359]);
 			OrderService::deleteByCondition(['merchantId' => 12359]);
 		}
-
+		
 		//用户删除概念的提出
 		$sql = "ALTER TABLE xhUser ADD `delStatus` TINYINT NOT NULL DEFAULT 0 COMMENT '删除状态 0未删除 1已删除' AFTER `addPrecision`;
 UPDATE xhUser SET delStatus=1 WHERE merchantId=0;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
-
+		
 		//小程序
 		$sql = "CREATE TABLE `xhMiniProgram` (
   `id` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
@@ -1166,7 +1166,7 @@ UPDATE xhUser SET delStatus=1 WHERE merchantId=0;";
   `addTime` INT(11) NOT NULL DEFAULT '0' COMMENT '添加时间'
 ) ENGINE=INNODB AUTO_INCREMENT=12566 DEFAULT CHARSET=utf8 COMMENT='小程序';";
 		Yii::$app->db->createCommand($sql)->execute($sql);
-
+		
 		$sql = "CREATE TABLE IF NOT EXISTS `xhMerchantInit`(
 id INT NOT NULL AUTO_INCREMENT PRIMARY KEY,
 merchantId INT NOT NULL DEFAULT 0 COMMENT '商家id',
@@ -1185,17 +1185,17 @@ userId INT NOT NULL DEFAULT 0 COMMENT '客户id',
 `addTime` INT NOT NULL DEFAULT 0 COMMENT '添加时间'
 )COMMENT='客户升级';";
 		Yii::$app->db->createCommand($sql)->execute($sql);
-
+		
 		$sql = "ALTER TABLE `xhUserUpgrade` ADD `gainType` TINYINT NOT NULL DEFAULT 0 COMMENT '获得方式 0管理员升级会员 1消费 2充值' AFTER `prevMember`;
 ALTER TABLE `xhUserGrowth` ADD `gainType` TINYINT NOT NULL DEFAULT 0 COMMENT '获得方式 0管理员升级会员 1消费 2充值' AFTER `capitalType`;
 ALTER TABLE `xhUserGrowth` DROP COLUMN `capitalType`;";
 		Yii::$app->db->createCommand($sql)->execute($sql);
-
+		
 		$sql = "ALTER TABLE `xhOrder` MODIFY `discountType` TINYINT NOT NULL DEFAULT 0 COMMENT '优惠类型 0没有优惠 1使用优惠卷 2会员打折 3随机优惠';";
 		Yii::$app->db->createCommand($sql)->execute($sql);
-
+		
 	}
-
+	
 	//数据迁移 shish 2020.1.12
 	//./yii upgrade/sync
 	public function actionSync()
@@ -1294,5 +1294,12 @@ ALTER TABLE `xhUserGrowth` DROP COLUMN `capitalType`;";
 		$merchant = xhMerchantService::getById($id);
 		xhWxMenuService::applyInit($merchant);
 	}
+
+	//测试生成头像有没问题
+	public function actionAddAvatar($id)
+	{
+		UserService::deleteByCondition(['merchantId' => $id]);
+		UserService::syncWxAllUser($id);
+	}
 	
 }