Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

app-ghs/controllers/AdminController.php

@@ -14,7 +14,7 @@ use bizHd\user\classes\UserClass;
 class AdminController extends BaseController
 {
 	
-	public $guestAccessAction = ['recent-shop','mini-full-info','mini-mobile'];
+	public $guestAccess = ['recent-shop','mini-full-info','mini-mobile'];
 	
 	//最近店铺 ssh 2021.2.27
 	public function actionRecentShop()

app-ghs/controllers/ApplyController.php

@@ -20,7 +20,7 @@ use yii\web\Controller;
 class ApplyController extends BaseController
 {
 
-    public $guestAccessAction = ['register'];
+    public $guestAccess = ['register'];
 
     //邀请开店列表 ssh 2021.1.28
     public function actionList()

app-ghs/controllers/BaseController.php

@@ -25,7 +25,7 @@ class BaseController extends PublicController
     public $appId;
     public $isWx = false;
     public $isLogin = false;
-    public $guestAccessAction = [];//不需要登陆的方法名
+    public $guestAccess = [];//不需要登陆的方法名
 
     //ssh 2020.3.8
     public function beforeAction($action)
@@ -49,7 +49,7 @@ class BaseController extends PublicController
         $lookShopId = $header['shop-id'] ?? 0;
         if (!empty($lookShopId)) {
             //商城和下单页
-            if (in_array($action->id, $this->guestAccessAction) == false) {
+            if (in_array($action->id, $this->guestAccess) == false) {
                 util::fail('您没有权限访问哦~');
             }
             $shop = ShopClass::getById($lookShopId);
@@ -65,7 +65,7 @@ class BaseController extends PublicController
         } else {
             //后台
             $currentShopId = $admin['currentShopId'] ?? 0;
-            if (empty($currentShopId) && in_array($action->id, $this->guestAccessAction) == false) {
+            if (empty($currentShopId) && in_array($action->id, $this->guestAccess) == false) {
                 util::fail('您没有权限访问哦！');
             }
             $this->shopId = $currentShopId;

app-ghs/controllers/OrderController.php

@@ -23,7 +23,7 @@ use common\components\stringUtil;
 class OrderController extends BaseController
 {
 
-    public $guestAccessAction = ['create-order', 'order-relate', 'fast-pay'];
+    public $guestAccess = ['create-order', 'order-relate', 'fast-pay'];
 
     //订单列表 ssh 2021.1.20
     public function actionList()

app-ghs/controllers/OrderItemController.php

@@ -11,7 +11,7 @@ use Yii;
 class OrderItemController extends BaseController
 {
 
-    public $guestAccessAction = [];
+    public $guestAccess = [];
 
     //重选花材 ssh 2021.3.2
     public function actionReset()

app-ghs/controllers/ProductController.php

@@ -20,7 +20,7 @@ use Yii;
 class ProductController extends BaseController
 {
 
-    public $guestAccessAction = ['index'];
+    public $guestAccess = ['index'];
 
     //开单时获取所有的分类花材信息
     //库存预警

app-ghs/controllers/RegionController.php

@@ -8,7 +8,7 @@ use common\components\util;
 class RegionController extends BaseController
 {
 
-    public $guestAccessAction = ['tree'];
+    public $guestAccess = ['tree'];
 
 	//地区相关信息 ssh 2020.1.14
 	public function actionTree()

app-ghs/controllers/SetMealController.php

@@ -10,7 +10,7 @@ use common\components\util;
 class SetMealController extends BaseController
 {
 
-    public $guestAccessAction = ['get-detail'];
+    public $guestAccess = ['get-detail'];
 
 	//套餐列表 ssh 2019.12.8
 	public function actionList()

app-ghs/controllers/TestController.php

@@ -20,7 +20,7 @@ use common\components\util;
 class TestController extends BaseController
 {
 
-	public $guestAccessAction = ['inform', 'notice','order-query','add-order'];
+	public $guestAccess = ['inform', 'notice','order-query','add-order'];
 
 
 	//dada 城市code

app-ghs/controllers/UploadController.php

@@ -15,7 +15,7 @@ use yii\imagine\Image;
 class UploadController extends BaseController
 {
 	
-	public $guestAccessAction = [];
+	public $guestAccess = [];
 	
 	//上传图片接口
 	public function actionSaveImg()

app-hd/controllers/AdminController.php

@@ -13,7 +13,7 @@ use bizHd\user\classes\UserClass;
 class AdminController extends BaseController
 {
 
-	public $guestAccessAction = ['mini-full-info','mini-mobile'];
+	public $guestAccess = ['mini-full-info','mini-mobile'];
 
 	//最近店铺 ssh 2021.2.27
 	public function actionRecentShop()

app-hd/controllers/ApplyController.php

@@ -19,7 +19,7 @@ use yii\web\Controller;
 class ApplyController extends BaseController
 {
 
-    public $guestAccessAction = ['register'];
+    public $guestAccess = ['register'];
 
     //我的代理 ssh 2019.12.26
     public function actionList()

app-hd/controllers/BaseController.php

@@ -27,7 +27,7 @@ class BaseController extends PublicController
     public $isWx = false;
     public $isLogin = false;
     //游客可以访问的方法
-    public $guestAccessAction = [];
+    public $guestAccess = [];
 
     //ssh 2020.3.8
     public function beforeAction($action)
@@ -52,7 +52,7 @@ class BaseController extends PublicController
 
         if (!empty($lookShopId)) {
             //商城
-            if (in_array($action->id, $this->guestAccessAction) == false) {
+            if (in_array($action->id, $this->guestAccess) == false) {
                 util::fail('您没有权限访问哦');
             }
             $shop = ShopClass::getById($lookShopId);
@@ -76,7 +76,7 @@ class BaseController extends PublicController
             //后台
             $currentShopId = $admin['currentShopId'] ?? 0;
             if (empty($currentShopId)) {
-                if (in_array($action->id, $this->guestAccessAction) == false) {
+                if (in_array($action->id, $this->guestAccess) == false) {
                     util::fail('您不是员工没有权限访问');
                 }
             } else {

app-hd/controllers/GoodsController.php

@@ -18,7 +18,7 @@ use bizHd\order\services\OrderService;
 class GoodsController extends BaseController
 {
 
-    public $guestAccessAction = ['detail'];
+    public $guestAccess = ['detail'];
 
     //商品列表 ssh 2019.12.7
     public function actionList()

app-hd/controllers/MainController.php

@@ -11,7 +11,7 @@ use common\components\util;
 class MainController extends BaseController
 {
 
-	public $guestAccessAction = ['index'];
+	public $guestAccess = ['index'];
 	
     public function actionDemo()
     {

app-hd/controllers/MapController.php

@@ -9,7 +9,7 @@ use Yii;
 class MapController extends BaseController
 {
 	
-	public $guestAccessAction = ['suggestion'];
+	public $guestAccess = ['suggestion'];
 	
 	//腾讯地图关键词输入提醒 ssh 2020.1.21
 	public function actionSuggestion()

app-hd/controllers/MerchantController.php

@@ -17,7 +17,7 @@ use yii\web\Controller;
 class MerchantController extends BaseController
 {
 
-    public $guestAccessAction = ['detail', 'introduce-shop'];
+    public $guestAccess = ['detail', 'introduce-shop'];
 
     //运费设置 ssh 2019.12.8
     public function actionFreightSetting()

app-hd/controllers/OrderController.php

@@ -28,7 +28,7 @@ use common\components\httpUtil;
 class OrderController extends BaseController
 {
 
-    public $guestAccessAction = ['order-relate', 'fast-pay', 'create-order', 'list'];
+    public $guestAccess = ['order-relate', 'fast-pay', 'create-order', 'list'];
 
     //商城下单操作 ssh 2019.12.3
     public function actionCreateOrder()

app-hd/controllers/PtItemController.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace hd\controllers;
+
+use biz\item\classes\PtItemClass;
+use common\components\stringUtil;
+use common\components\util;
+use Yii;
+
+class PtItemController extends BaseController
+{
+
+    //获取平台里的花材列表
+    public function actionList()
+    {
+        $name = Yii::$app->request->get('name', '');
+        $where = [];
+        if (!empty($name)) {
+            if (stringUtil::isLetter($name)) {
+                $where['py'] = ['like', $name];
+            } else {
+                $where['name'] = ['like', $name];
+            }
+        }
+        $sjId = $this->sjId;
+        $list = PtItemClass::getItemList($where, true,$sjId);
+        util::success($list);
+    }
+
+}

app-hd/controllers/RegionController.php

@@ -8,7 +8,7 @@ use common\components\util;
 class RegionController extends BaseController
 {
 
-    public $guestAccessAction = ['tree'];
+    public $guestAccess = ['tree'];
 
     //地区相关信息 ssh 2020.1.14
     public function actionTree()

app-hd/controllers/SetMealController.php

@@ -10,7 +10,7 @@ use common\components\util;
 class SetMealController extends BaseController
 {
 
-    public $guestAccessAction = ['get-detail'];
+    public $guestAccess = ['get-detail'];
 
     //套餐列表 ssh 2019.12.8
     public function actionList()

app-hd/controllers/TestController.php

@@ -13,7 +13,7 @@ use common\components\util;
 class TestController extends BaseController
 {
 
-	public $guestAccessAction = ['inform', 'notice','order-query','add-order'];
+	public $guestAccess = ['inform', 'notice','order-query','add-order'];
 
 	//新增订单
 	public function actionAddOrder()

app-hd/controllers/UploadController.php

@@ -16,7 +16,7 @@ use yii\imagine\Image;
 class UploadController extends BaseController
 {
 
-	public $guestAccessAction = [];
+	public $guestAccess = [];
 
 	//上传图片接口
 	public function actionSaveImg()

app-hd/controllers/UserController.php

@@ -27,7 +27,7 @@ use yii\helpers\Json;
 class UserController extends BaseController
 {
 
-    public $guestAccessAction = ['my-profile', 'discount'];
+    public $guestAccess = ['my-profile', 'discount'];
 
     //客户列表 ssh 2019.11.30
     public function actionList()

app-mall/controllers/BaseController.php

@@ -16,7 +16,7 @@ class BaseController extends PublicController
 {
 
     public $validate = true;
-    public $guestAccessAction = [];
+    public $guestAccess = [];
     public $userId = 0, $user, $shopId;
     public $sjId, $sj, $sjExtend, $customId = 0, $custom = [];
     public $isWx;
@@ -29,7 +29,7 @@ class BaseController extends PublicController
         $userId = jwt::getLoginId();
 
         $sjId = 0;
-        if (in_array($action->id, $this->guestAccessAction) == false){
+        if (in_array($action->id, $this->guestAccess) == false){
 
             $header = httpUtil::getHeader();
             $shopId = isset($header['account']) ? $header['account'] : 0;
@@ -68,7 +68,7 @@ class BaseController extends PublicController
             }
             $this->user = $userInfo;
 
-            if (in_array($action->id, $this->guestAccessAction) == false) {
+            if (in_array($action->id, $this->guestAccess) == false) {
 
                 $custom = CustomClass::getCurrentCustom($sjId, $userInfo);
                 if (empty($custom)) {
@@ -82,7 +82,7 @@ class BaseController extends PublicController
 
         }
         //游客可以访问的方法
-        if (in_array($action->id, $this->guestAccessAction)) {
+        if (in_array($action->id, $this->guestAccess)) {
             $this->validate = true;
         }
 

app-mall/controllers/MapController.php

@@ -9,7 +9,7 @@ use Yii;
 class MapController extends BaseController
 {
 
-	public $guestAccessAction = ['suggestion'];
+	public $guestAccess = ['suggestion'];
 
 	//腾讯地图关键词输入提醒 ssh 2020.1.21
 	public function actionSuggestion()

app-mall/controllers/OrderController.php

@@ -23,7 +23,7 @@ use common\components\util;
 class OrderController extends BaseController
 {
 
-    public $guestAccessAction = ['order-relate', 'fast-pay'];
+    public $guestAccess = ['order-relate', 'fast-pay'];
 
     //商城下单操作 ssh 2019.12.3
     public function actionCreateOrder()

app-mall/controllers/PayController.php

@@ -29,7 +29,7 @@ use common\components\dict;
 class PayController extends BaseController
 {
 
-	public $guestAccessAction = ['get-params'];
+	public $guestAccess = ['get-params'];
 
 	
 

app-mall/controllers/UploadController.php

@@ -8,7 +8,7 @@ use common\components\util;
 class UploadController extends BaseController
 {
 	
-	public $guestAccessAction = [];
+	public $guestAccess = [];
 	
 	//上传图片接口
 	public function actionSaveImg()

app-mall/controllers/UserController.php

@@ -16,7 +16,7 @@ use yii\helpers\Json;
 class UserController extends BaseController
 {
 
-    public $guestAccessAction = ['recent-shop'];
+    public $guestAccess = ['recent-shop'];
 
     //最近店铺 ssh 2021.2.27
     public function actionRecentShop()

app-pt/controllers/BaseController.php

@@ -12,7 +12,7 @@ class BaseController extends PublicController
 
     public $staff, $staffId, $userId, $user;
     public $isLogin = false;
-    public $guestAccessAction = [];//不需要登陆的方法名
+    public $guestAccess = [];//不需要登陆的方法名
     public $validate = true;
 
     public function beforeAction($action)
@@ -24,7 +24,7 @@ class BaseController extends PublicController
             $this->validate = false;
         }
         //游客可以访问的方法
-        if (in_array($action->id, $this->guestAccessAction)) {
+        if (in_array($action->id, $this->guestAccess)) {
             $this->validate = true;
         } else {
             $staff = StaffService::getById($staffId);

app-pt/controllers/CsController.php

@@ -10,7 +10,7 @@ use Yii;
 
 class CsController extends BaseController
 {
-	public $guestAccessAction = ['index'];
+	public $guestAccess = ['index'];
 	
 	public function actionIndex()
 	{

app-pt/controllers/GhsController.php

@@ -13,7 +13,7 @@ use Yii;
 class GhsController extends BaseController
 {
 
-    public $guestAccessAction = [];
+    public $guestAccess = [];
 
     //绑定供货商 shish 2021.3.29
     public function actionBindGhs()

app-pt/controllers/ItemClassController.php

@@ -12,7 +12,6 @@ use common\components\util;
 class ItemClassController extends BaseController
 {
 
-
     public function actionList()
     {
         $where = [];
@@ -41,4 +40,12 @@ class ItemClassController extends BaseController
         util::complete('不能删除');
     }
 
+    //取所有的分类 shish 2021.4.10
+    public function actionGetAllClass()
+    {
+        $where = [];
+        $list = PtItemClassClass::getAllList(['id','name'], $where);
+        util::success(['list'=>$list]);
+    }
+
 }

app-pt/controllers/MainController.php

@@ -10,7 +10,7 @@ use common\services\xhWxOpenAdminService;
 class MainController extends PlatformController
 {
 
-    public $guestAccessAction = ['login', 'logout', 'check-login', 'index'];
+    public $guestAccess = ['login', 'logout', 'check-login', 'index'];
 
     public function actionIndex()
     {

app-pt/controllers/PlatformController.php

@@ -12,7 +12,7 @@ class PlatformController extends PublicController
 {
 	
 	public $isLogin = false;
-	public $guestAccessAction = [];//不需要登陆的方法名
+	public $guestAccess = [];//不需要登陆的方法名
 	public $admin, $adminId, $menuList, $subMenuList;
 	
 	public function beforeAction($action)
@@ -25,7 +25,7 @@ class PlatformController extends PublicController
 		$this->subMenuList = PlatMenuService::getSubMenu($controllerName, $actionName);
 		
 		$this->isLogin = xhWxOpenAdminService::isLogin();
-		if (!in_array($action->id, $this->guestAccessAction) && $this->isLogin == false) {
+		if (!in_array($action->id, $this->guestAccess) && $this->isLogin == false) {
 			$this->redirect(['main/login']);
 			Yii::$app->end();
 		}

app-pt/controllers/StaffController.php

@@ -11,7 +11,7 @@ use Yii;
 class StaffController extends BaseController
 {
 
-    public $guestAccessAction = ['login'];
+    public $guestAccess = ['login'];
 
     public function actionLogin()
     {

app-pt/controllers/UnitController.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace pt\controllers;
+
+use biz\item\classes\UnitClass;
+use common\components\util;
+use Yii;
+
+class UnitController extends BaseController
+{
+
+	//取所有的单位 shish 2021.4.10
+	public function actionGetAllUnit()
+    {
+        $where = [];
+        $list = UnitClass::getAllList(['id','name'], $where);
+        util::success(['list'=>$list]);
+    }
+
+}

app-pt/controllers/UploadController.php

@@ -0,0 +1,107 @@
+<?php
+
+namespace pt\controllers;
+
+use common\components\business;
+use common\components\dirUtil;
+use common\components\oss;
+use common\components\stringUtil;
+use common\components\util;
+use yii\imagine\Image;
+
+class UploadController extends BaseController
+{
+
+	public $guestAccess = [];
+
+	//上传图片接口
+	public function actionSaveImg()
+	{
+		header('Content-type:text/html;charset=utf-8');
+		$base64 = file_get_contents('php://input');
+		$base64_image_content = str_replace("content=", "", urldecode($base64));
+
+		//匹配出图片的格式
+		if (preg_match('/^(data:\s*image\/(\w+);base64,)/', $base64_image_content, $result)) {
+			$type = $result[2];
+			$merchantId = 0;
+			$month = date("Ym");
+			$date = date("d");
+			$path = dirUtil::getImgUploadDir() . "/{$merchantId}/{$month}/{$date}/";
+			if (!file_exists($path)) {
+				//检查是否有该文件夹，如果没有就创建，并给予最高权限
+				mkdir($path, 0700, true);
+			}
+			$preFileName = stringUtil::uniqueFileName();
+			$newFile = $preFileName . ".{$type}";
+			$fullPathFile = $path . $newFile;
+			if (file_put_contents($fullPathFile, base64_decode(str_replace($result[1], '', $base64_image_content))) == false) {
+				util::fail('上传失败！！');
+			}
+			$img = "uploads/{$merchantId}/{$month}/{$date}/" . $newFile;
+			$imgInfo = getimagesize($fullPathFile);
+			$width = $imgInfo[0];
+			$height = $imgInfo[1];
+
+			//如果图片太大，进行压缩，并删除原图
+			if ($width > 800) {
+				$newWidth = 800;
+				$newHeight = ceil((800 * $height) / $width);
+				$preFileName = stringUtil::uniqueFileName();
+				$newFile = $preFileName . ".{$type}";
+				$newFullPathFile = $path . $newFile;
+				Image::thumbnail($fullPathFile, $newWidth, $newHeight)->save($newFullPathFile, ['quality' => 100]);
+				$width = $newWidth;
+				$height = $newHeight;
+				$img = "uploads/{$merchantId}/{$month}/{$date}/" . $newFile;
+				unlink($fullPathFile);
+				$fullPathFile = $newFullPathFile;
+			}
+
+			//上传oss  2021.3.18 linqh
+			oss::uploadImage($img,$fullPathFile);
+
+			//生成小图 200px
+			$smallWidth = 200;
+			$smallHeight = ceil((200 * $height) / $width);
+			$smallFullPathFile = $path . $preFileName . '_small.' . $type;
+			Image::thumbnail($fullPathFile, $smallWidth, $smallHeight)->save($smallFullPathFile, ['quality' => 100]);
+
+			$data = business::formatUploadImg($img);
+
+			$data['shortUrl'] = $img;
+			util::success($data);
+		}
+		util::fail('上传失败！');
+	}
+
+	//保存图片 ssh 2019.12.20
+	public function actionSave()
+	{
+		header('Content-type:text/html;charset=utf-8');
+		$base64_image_content = '';
+		//匹配出图片的格式
+		if (preg_match('/^(data:\s*image\/(\w+);base64,)/', $base64_image_content, $result)) {
+			$type = $result[2];
+			$merchantId = 12358;
+			$month = date("Ym");
+			$date = date("d");
+			$path = dirUtil::getImgUploadDir() . "/{$merchantId}/{$month}/{$date}/";
+			if (!file_exists($path)) {
+				//检查是否有该文件夹，如果没有就创建，并给予最高权限
+				mkdir($path, 0700, true);
+			}
+			$preFileName = stringUtil::uniqueFileName();
+			$newFile = $preFileName . ".{$type}";
+			$fullPath = $path . $newFile;
+			if (file_put_contents($fullPath, base64_decode(str_replace($result[1], '', $base64_image_content))) == false) {
+				util::fail('上传失败');
+			}
+			$img = "/uploads/{$merchantId}/{$month}/{$date}/" . $newFile;
+			$data = business::formatUploadImg($img);
+			$data['shortUrl'] = $img;
+			util::success($data);
+		}
+	}
+
+}

app-pt/controllers/WxOpenController.php

@@ -22,7 +22,7 @@ use bizHd\wx\classes\WxOpenClass;
 class WxOpenController extends PublicController
 {
 
-    public $guestAccessAction = ['bind-open'];
+    public $guestAccess = ['bind-open'];
 
     //开放平台开始授权 ssh 2020.1.16
     public function actionBeginAuth()

app-pt/controllers/ZhhController.php

@@ -10,6 +10,6 @@ use common\services\xhWxOpenAdminService;
 class ZhhController extends PlatformController
 {
 
-	public $guestAccessAction = [];
+	public $guestAccess = [];
 
 }

sql.sql

@@ -2018,6 +2018,12 @@ ALTER TABLE xhCustom DROP COLUMN `totalBuyNum`;
 ALTER TABLE `xhUser` ADD recentShop VARCHAR(800) NOT NULL DEFAULT '' COMMENT '最近访问的店铺' AFTER `visitTime`;
 ALTER TABLE xhPurchaseClear ADD `deadline` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' COMMENT '订单失效时间' AFTER `purchaseIds`;
 ALTER TABLE xhPurchaseClear ADD changePrice TINYINT NOT NULL DEFAULT 1 COMMENT '1可以修改价格 2不能修改价格，微信发起支付后不能修改' AFTER `deadline`;
+ALTER TABLE xhPtItemClass ADD `num` SMALLINT(6) NOT NULL DEFAULT '0' COMMENT '花材数量' AFTER `group`;
+ALTER TABLE `xhPtItem` ADD inTurn MEDIUMINT NOT NULL DEFAULT 100 COMMENT '排序' AFTER `smallUnit`;
+ALTER TABLE xhPtItemClass DROP COLUMN `addTime`;
+ALTER TABLE xhPtItemClass DROP COLUMN `updateTime`;
+ALTER TABLE xhPtItemClass ADD `addTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '添加时间' AFTER `inTurn`;
+ALTER TABLE xhPtItemClass ADD `updateTime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间' AFTER `addTime`;
 
 ========
 ==linqh 2021-4-9