供应商

app-ghs/controllers/AuthController.php

@@ -175,7 +175,7 @@ class AuthController extends PublicController
     //静默获取小程序用户信息
     public function actionMiniInfo()
     {
-        //供货商平台
+        //供应商平台
         Yii::$app->params['ptStyle'] = dict::getDict('ptStyle', 'ghs');
         $code = Yii::$app->request->get('code', '');
         if (empty($code)) {

app-ghs/controllers/BaseController.php

@@ -26,7 +26,7 @@ class BaseController extends PublicController
     //ssh 2020.3.8
     public function beforeAction($action)
     {
-        //定义平台类型 1花店 2供货商
+        //定义平台类型 1花店 2供应商
         Yii::$app->params['ptStyle'] = dict::getDict('ptStyle', 'ghs');
         //token验证
         $adminId = jwt::getLoginId();
@@ -42,7 +42,7 @@ class BaseController extends PublicController
             util::logout('帐号无效');
         }
         $this->admin = $admin;
-        // 只能供货商访问
+        // 只能供应商访问
         if ($admin->style != AdminClass::STYLE_GHS) {
             util::fail('您没有权限访问哦');
         }

app-ghs/controllers/CustomController.php

@@ -71,7 +71,7 @@ class CustomController extends BaseController
                 'dist' => $dist,
                 'address' => $address,
                 'status' => ApplyClass::STATUS_PASS,
-                'replace' => 1,//1表示供货商添加的客户
+                'replace' => 1,//1表示供应商添加的客户
             ];
             $apply = ApplyService::replaceRetail($applyData);
             $id = $apply['id'] ?? 0;

app-ghs/controllers/GhsController.php

@@ -14,7 +14,7 @@ use common\components\util;
 class GhsController extends BaseController
 {
 
-    //添加供货商 shish 20210611
+    //添加供应商 shish 20210611
     public function actionAdd()
     {
         $post = Yii::$app->request->post();
@@ -61,7 +61,7 @@ class GhsController extends BaseController
                 'style' => SjClass::STYLE_KM_SUPPLIER,
                 'address' => $address,
                 'status' => ApplyClass::STATUS_PASS,
-                'replace' => 1,//1表示供货商添加的客户或供货商
+                'replace' => 1,//1表示供应商添加的客户或供应商
             ];
             $apply = ApplyService::replaceKmGhs($applyData);
             $id = $apply['id'] ?? 0;
@@ -85,7 +85,7 @@ class GhsController extends BaseController
         }
     }
 
-    //供货商列表 ssh 2021.1.18
+    //供应商列表 ssh 2021.1.18
     public function actionList()
     {
         $get = Yii::$app->request->get();

app-hd/controllers/BaseController.php

@@ -28,7 +28,7 @@ class BaseController extends PublicController
     //ssh 2020.3.8
     public function beforeAction($action)
     {
-        //定义平台类型 1花店 2供货商 3商城
+        //定义平台类型 1花店 2供应商 3商城
         Yii::$app->params['ptStyle'] = dict::getDict('ptStyle', 'hd');
 
         //token验证 
@@ -46,7 +46,7 @@ class BaseController extends PublicController
         $adminId = $admin->id;
         $this->admin = $admin;
         $this->adminId = $adminId;
-        // 只能供货商访问
+        // 只能供应商访问
         if ($admin->style != ClassesAdminClass::STYLE_HD) {
             util::fail('您没有权限访问哦！');
         }

app-hd/controllers/GhsController.php

@@ -12,7 +12,7 @@ class GhsController extends BaseController
 
     public $guestAccess = ['info'];
 
-    //供货商列表 ssh 2021.1.24
+    //供应商列表 ssh 2021.1.24
     public function actionList()
     {
         $where = [];
@@ -30,14 +30,14 @@ class GhsController extends BaseController
         util::success($info);
     }
 
-    //根据门店获取供货商信息 shish 2021.4.14
+    //根据门店获取供应商信息 shish 2021.4.14
     public function actionInfo()
     {
         $shopId = Yii::$app->request->get('shopId');
         if (isset($this->shopId) && !empty($this->shopId)) {
             $ghs = GhsClass::build($shopId, $this->shopId);
         } else {
-            //没有开店也给显示供货商信息
+            //没有开店也给显示供应商信息
             $shop = ShopClass::getShopInfo($shopId);
             $shopName = $shop['shopName'] ?? '';
             $sjName = $shop['merchantName'] ?? '';

app-hd/controllers/ProductController.php

@@ -112,7 +112,7 @@ class ProductController extends BaseController
 
     }
 
-    //从零售端采购入库，查看供货商的某个门店的product
+    //从零售端采购入库，查看供应商的某个门店的product
     public function actionGhsItem()
     {
         $get = Yii::$app->request->get();
@@ -127,11 +127,11 @@ class ProductController extends BaseController
         } else {
             $shopId = $get['shopId'] ?? 0;
             if (empty($shopId)) {
-                util::fail('没有供货商信息');
+                util::fail('没有供应商信息');
             }
             $shop = ShopClass::getShopInfo($shopId);
             if (empty($shop)) {
-                util::fail('没有供货商门店');
+                util::fail('没有供应商门店');
             }
             $sjId = $shop['sjId'] ?? 0;
         }

app-hd/controllers/PurchaseController.php

@@ -25,13 +25,13 @@ class PurchaseController extends BaseController
     {
         $post = Yii::$app->request->post();
         $ghsId = $post['ghsId'] ?? 0;
-        //供货商
+        //供应商
         $ghsInfo = GhsClass::getById($ghsId);
         if (empty($ghsInfo)) {
-            util::fail('没有找到供货商');
+            util::fail('没有找到供应商');
 
         }
-        //增加判定，若是快递配置，则判定供货商是否开通达达，若未开通，则不能现在配送
+        //增加判定，若是快递配置，则判定供应商是否开通达达，若未开通，则不能现在配送
         $getType = $post['getType'] ?? 0;
         if ($getType == 1) {
             //配送
@@ -66,7 +66,7 @@ class PurchaseController extends BaseController
             $post['shopAdminName'] = $name;
             $product = $post['product'] ?? '';
             $productList = json_decode($product, true);
-            //判断product数据是不是同个供货商的
+            //判断product数据是不是同个供应商的
             ProductClass::valid($productList, $currentShopId);
             $post['product'] = $productList;
             $post['sendCost'] = isset($post['sendCost']) && is_numeric($post['sendCost']) ? $post['sendCost'] : 0;
@@ -275,11 +275,11 @@ class PurchaseController extends BaseController
     {
         $post = Yii::$app->request->post();
         $ghsId = $post['ghsId'] ?? 0;
-        //供货商
+        //供应商
         $ghsInfo = GhsClass::getById($ghsId);
 
         if (empty($ghsInfo)) {
-            util::fail('没有找到供货商');
+            util::fail('没有找到供应商');
         }
         //花材信息
         $productJson = $post['product'] ?? '';
@@ -329,7 +329,7 @@ class PurchaseController extends BaseController
             $sendTime = date('Y-m-d H:i', strtotime("+30 minute"));
         }
 
-        //找供货商的客户信息，用里面的配送相关地址信息
+        //找供应商的客户信息，用里面的配送相关地址信息
         $customId = $ghsInfo['customId'] ?? 0;
         $customInfo = CustomClass::getById($customId);
         if (empty($customInfo)) {
@@ -340,13 +340,13 @@ class PurchaseController extends BaseController
         $shopNo = ShopExpressClass::getShopNo($ghsSjId, $ghsShopId);
         if (!$shopNo) {
             //使用自定义运费
-            //util::fail('供货商暂未开通配送');
+            //util::fail('供应商暂未开通配送');
             $cost = freight::getCost($ghsInfo['lat'], $ghsInfo['long'], $customInfo['lat'], $customInfo['long'], $weight);
             util::success(['sedCost' => $cost]);
         }
         //组装订单信息
         $info = [];
-        //发送放的商家信息，即供货商的相关信息
+        //发送放的商家信息，即供应商的相关信息
         $info['sjId'] = $ghsSjId;
         $info['shopId'] = $ghsShopId;
         $info['actPrice'] = $price;//价格

app-mall/controllers/BaseController.php

@@ -27,7 +27,7 @@ class BaseController extends PublicController
 
     public function beforeAction($action)
     {
-        //定义平台类型 1花店 2供货商 3商城
+        //定义平台类型 1花店 2供应商 3商城
         Yii::$app->params['ptStyle'] = dict::getDict('ptStyle', 'mall');
 
         $shopId = Yii::$app->request->get('account', 0);

app-pt/config/main.php

@@ -39,10 +39,10 @@ return [
 			'showScriptName' => false,
 			'rules' => [
 
-				//花店和供货商 授权事件接收URL style 1 花店 2 供货商 3商城
+				//花店和供应商 授权事件接收URL style 1 花店 2 供应商 3商城
 				'wx-open-api/<style:\w+>' => 'wx-open/api',
 
-				//公众号消息与事件接收地址 style 1 花店 2 供货商 3商城
+				//公众号消息与事件接收地址 style 1 花店 2 供应商 3商城
 				'wx/<style:\w+>/<appId:\w+>' => 'wx/api',
 
 				//公众号授权回调通知地址

app-pt/controllers/GhsController.php

@@ -14,7 +14,7 @@ class GhsController extends BaseController
 
     public $guestAccess = [];
 
-    //绑定供货商 shish 2021.3.29
+    //绑定供应商 shish 2021.3.29
     public function actionBindGhs()
     {
         util::fail('已关闭');

app-pt/controllers/WxController.php

@@ -168,7 +168,7 @@ class WxController extends PublicController
         } elseif ($style == dict::getDict('ptStyle', 'ghs')) {
             $merchant = WxOpenClass::getGhsWxInfo();
             $isOpen = 2;
-            //供货商
+            //供应商
             if ($this->msgType == 'event') {
 
                 switch ($Event) {

app-pt/controllers/WxOpenController.php

@@ -126,7 +126,7 @@ class WxOpenController extends PublicController
         $accessTokenTime = date("Y-m-d H:i:s", (time() + $expires_in - 100));//安全起见，将过期时间设置得比微信里还短100秒
 
         if ($id == 'ghs') {
-            //这是供货商
+            //这是供应商
             $sjWxInfo = WxOpenClass::getGhsWxInfo();
         } elseif ($id == 'hd') {
             //这是零售商
@@ -161,9 +161,9 @@ class WxOpenController extends PublicController
                 $wxMiniBaseId = 0;
                 $msg = '未知状态';
                 if ($id == 'ghs') {
-                    //供货商
+                    //供应商
                     $wxMiniBaseId = $open['wxMiniBaseId'] ?? 0;
-                    $msg = '供货商小程序绑定成功';
+                    $msg = '供应商小程序绑定成功';
                 } elseif ($id == 'hd') {
                     //零售店
                     $wxMiniBaseId = $open['wxMiniBaseId'] ?? 0;
@@ -213,9 +213,9 @@ class WxOpenController extends PublicController
                 $wxBaseId = 0;
                 $msg = '未知状态';
                 if ($id == 'ghs') {
-                    //供货商公众号
+                    //供应商公众号
                     $wxBaseId = $open['wxBaseId'] ?? 0;
-                    $msg = '供货商公众号绑定成功';
+                    $msg = '供应商公众号绑定成功';
                 } elseif ($id == 'hd') {
                     //零售商公众号
                     $wxBaseId = $open['wxBaseId'] ?? 0;
@@ -255,7 +255,7 @@ class WxOpenController extends PublicController
     }
 
     //开放平台设置相关操作 ssh 2020.1.18
-    //供货商使用 https://api.pt.hzghd.com/wx-open/bind-open?actId=3
+    //供应商使用 https://api.pt.hzghd.com/wx-open/bind-open?actId=3
     //花店使用 https://api.pt.huaml.com/wx-open/bind-open?actId=3
     //商城使用 https://api.pt.theflorist.cn/wx-open/bind-open?actId=3
     public function actionBindOpen()
@@ -270,7 +270,7 @@ class WxOpenController extends PublicController
             Yii::$app->params['ptStyle']  = dict::getDict('ptStyle', 'mall');
             $isOpen = 3;
         } elseif (strpos($host, 'hzghd.com') !== false || strpos($host, 'wixhb.com') !== false) {
-            //供货商
+            //供应商
             Yii::$app->params['ptStyle']  = dict::getDict('ptStyle', 'ghs');
             $isOpen = 2;
         } else {
@@ -294,7 +294,7 @@ class WxOpenController extends PublicController
             $wxAppId = $merchant['wxAppId'];
             $openAppId = $merchant['openAppId'];
         } elseif ($isOpen == 2) {
-            //供货商
+            //供应商
             $merchant = WxOpenClass::getGhsWxInfo();
             $miniAppId = $merchant['miniAppId'];
             $wxAppId = $merchant['wxAppId'];

biz-ghs/admin/classes/AdminClass.php

@@ -21,7 +21,7 @@ class AdminClass extends BaseClass
     CONST IDENTITY_UNKNOWN = 0;
     //客户，花店
     const IDENTITY_CUSTOM = 1;
-    //供货商员工
+    //供应商员工
     const IDENTITY_STAFF = 2;
 
     public static function getRecentShop($admin)

biz-ghs/clear/classes/ClearClass.php

@@ -41,7 +41,7 @@ class ClearClass extends BaseClass
                 util::fail('请选择有欠款的采购单');
             }
             if ($purchase->ghsId != $currentGhsId) {
-                util::fail('请选择同个供货商的订单');
+                util::fail('请选择同个供应商的订单');
             }
             $totalPrice = bcadd($totalPrice, $purchase->realPrice, 2);
         }
@@ -84,11 +84,11 @@ class ClearClass extends BaseClass
             util::fail($msg);
         }
 
-        //供货商欠款变更
+        //供应商欠款变更
         $ghsId = $order->ghsId;
         $ghs = GhsClass::getLockById($ghsId);
         if (empty($ghs)) {
-            util::fail('没有找到供货商信息');
+            util::fail('没有找到供应商信息');
         }
         $currentAmount = bcsub($ghs->debtAmount, $order->actPrice, 2);
         $ghs->debtAmount = $currentAmount;
@@ -99,9 +99,9 @@ class ClearClass extends BaseClass
         $shopId = $ghs->shopId;
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到供货商门店');
+            util::fail('没有找到供应商门店');
         }
-        //供货商应收客户款减少
+        //供应商应收客户款减少
         $currentGathering = bcsub($shop->mayGathering, $order->actPrice, 2);
         $shop->mayGathering = $currentGathering;
         $shop->save();
@@ -114,7 +114,7 @@ class ClearClass extends BaseClass
             $purchase->save();
         }
 
-        //供货商的客户欠款变化
+        //供应商的客户欠款变化
         $customId = $ghs->customId;
         $custom = CustomClass::getLockById($customId);
         if (empty($custom)) {
@@ -130,7 +130,7 @@ class ClearClass extends BaseClass
             $shop->save();
         }
 
-        //客户应付供货商款减少
+        //客户应付供应商款减少
         $customShopId = $custom->shopId;
         $customShop = ShopClass::getLockById($customShopId);
         if (empty($customShop)) {

biz-ghs/custom/classes/CustomClass.php

@@ -17,7 +17,7 @@ class CustomClass extends BaseClass
     const IS_DEBT_NO = 0;
     const IS_DEBT_YES = 1;
 
-    //建立客户和供货商关系
+    //建立客户和供应商关系
     public static function build($ghsShopId, $hdShopId)
     {
         return GhsClass::build($ghsShopId, $hdShopId, 2);

biz-ghs/custom/services/CustomService.php

@@ -11,18 +11,18 @@ class CustomService extends BaseService
 
     public static $baseFile = '\bizGhs\custom\classes\CustomClass';
 
-    //分享建立客户和供货商关系 ssh 2021.2.28
+    //分享建立客户和供应商关系 ssh 2021.2.28
     public static function shareBuildTrade($applyData, $newShop)
     {
         $shopId = $newShop->id ?? 0;
         $introShopId = $applyData['introShopId'] ?? 0;
-        //申请人是花店，介绍人是供货商
+        //申请人是花店，介绍人是供应商
         if ($applyData['style'] == SjClass::STYLE_RETAIL) {
             if ($applyData['introStyle'] == SjClass::STYLE_SUPPLIER) {
                 CustomClass::build($introShopId, $shopId);
             }
         }
-        //申请人是供货商，介绍人是花店
+        //申请人是供应商，介绍人是花店
         if ($applyData['style'] == SjClass::STYLE_SUPPLIER) {
             if ($applyData['introStyle'] == SjClass::STYLE_RETAIL) {
                 CustomClass::build($shopId, $introShopId);

biz-ghs/order/classes/OrderClass.php

@@ -84,7 +84,7 @@ class OrderClass extends BaseClass
     //欠款
     const DEBT_YES = 1;
 
-    //供货商开单生成
+    //供应商开单生成
     const ORDER_TYPE_GHS_ADD = 1;
     //零售采购生成
     const ORDER_TYPE_HD_ADD = 2;
@@ -345,7 +345,7 @@ class OrderClass extends BaseClass
         return ['list' => $list, 'itemStat' => $itemStat];
     }
 
-    //整合订单员工和供货商等信息 ssh 2021.1.19
+    //整合订单员工和供应商等信息 ssh 2021.1.19
     //$isList 是否列表页
     public static function groupOrder($list, $showButton = false, $showItem = false, $showExpress = false, $isList = false)
     {

biz-ghs/order/classes/OrderClearClass.php

@@ -72,7 +72,7 @@ class OrderClearClass extends BaseClass
         $custom->debtNum = $num;
         $custom->save();
 
-        //客户门店应付供货商款减少
+        //客户门店应付供应商款减少
         $customShopId = $custom->shopId;
         $customShop = ShopClass::getLockById($customShopId);
         if (empty($customShop)) {
@@ -109,7 +109,7 @@ class OrderClearClass extends BaseClass
         $ghsId = $custom->ghsId;
         $ghs = GhsClass::getLockById($ghsId);
         if (empty($ghs)) {
-            util::fail('没有找到供货商');
+            util::fail('没有找到供应商');
         }
         $remainAmount = bcsub($ghs->debtAmount, $amount, 2);
         if ($remainAmount < 0) {
@@ -121,7 +121,7 @@ class OrderClearClass extends BaseClass
         $ghs->debt = $remainAmount > 0 ? 2 : 1;
         $ghs->save();
 
-        //供货商的门店应收客户款减少
+        //供应商的门店应收客户款减少
         $shopId = $ghs->shopId;
         $shop = ShopClass::getLockById($shopId);
         $currentGathering = bcsub($shop->mayGathering, $amount, 2);

biz-ghs/order/classes/PurchaseOrderClass.php

@@ -193,11 +193,11 @@ class PurchaseOrderClass extends BaseClass
             //当天和当月支出统计
             StatOutClass::updateOrInsert($shop, $order['orderPrice']);
 
-            //供货商资产增加
+            //供应商资产增加
             $ghsId = $data['ghsId'] ?? 0;
             $ghs = GhsClass::getLockById($ghsId);
             if (empty($ghs)) {
-                util::fail('没有找到供货商');
+                util::fail('没有找到供应商');
             }
             $ghs->debt = GhsClass::DEBT_YES;
             $ghs->debtAmount = bcadd($ghs->debtAmount, $order['orderPrice'], 2);
@@ -287,7 +287,7 @@ class PurchaseOrderClass extends BaseClass
         }
         $orderData = self::groupAdmin($orderData);
 
-        //供货商信息
+        //供应商信息
         $ghsId = $orderData['ghsId'] ?? 0;
         $ghsInfo = GhsClass::getGhsInfo($ghsId);
         $orderData['supplierName'] = $ghsInfo['name'] ?? '';

biz-ghs/order/services/OrderService.php

@@ -33,7 +33,7 @@ class OrderService extends BaseService
     //添加订单
     public static function createOrder($data, $custom)
     {
-        //供货商销售单
+        //供应商销售单
         $return = OrderClass::addOrder($data);
         $saleId = $return->id ?? 0;
 
@@ -45,7 +45,7 @@ class OrderService extends BaseService
         $ghsId = $data['ghsId'] ?? 0;
         $ghs = GhsClass::getById($ghsId);
         if (empty($ghs)) {
-            util::fail('没有找到供货商');
+            util::fail('没有找到供应商');
         }
         $ghsName = $ghs['name'] ?? '';
         $ghsAvatar = $ghs['avatar'] ?? '';

biz-ghs/product/classes/ProductClass.php

@@ -721,7 +721,7 @@ class ProductClass extends BaseClass
     }
 
 
-    //供货商的productId => 零售端的productId  ,不存在的补productId(放在默认分类)
+    //供应商的productId => 零售端的productId  ,不存在的补productId(放在默认分类)
     //productList [{"productId":"113","bigNum":1,"smallNum":0,"classId":"-2","itemId":1}]
     public static function toggleProductList($productList, $hdShopId, $hdSjId)
     {
@@ -761,7 +761,7 @@ class ProductClass extends BaseClass
         return $productList;
     }
 
-    //供货商、零售端新开门店时，初始化花材
+    //供应商、零售端新开门店时，初始化花材
     public static function newShopInitProduct($sjId,$shopId,$newShopId,$adminId)
     {
         $product = self::getAllProduct($sjId, $shopId, "name,cover,classId,itemId,rank,price,priceLabel,cost,addPrice,stockWarning,weight,alias,py,ratio,bigUnit,smallUnit,bigUnitId,smallUnitId,inTurn");

biz-ghs/readMe.txt

@@ -1 +1 @@
-ghs 供货商
+ghs 供应商

biz-ghs/ws/services/WsService.php

@@ -46,7 +46,7 @@ class WsService
         return true;
     }
 
-    //零售端采购时，提示供货商(下所有有开启通知的员工)，你有新订单
+    //零售端采购时，提示供应商(下所有有开启通知的员工)，你有新订单
     //商城客户下单时，提示零售花店（下所有有开启通知的员工） 你有新的订单
     public static function newOrderNotice($shopAdminId)
     {

biz-hd/purchase/classes/PurchaseClass.php

@@ -39,7 +39,7 @@ class PurchaseClass extends BaseClass
     //自取
     const GET_TYPE_SELF_GET = 2;
 
-    //供货商开单生成
+    //供应商开单生成
     const ORDER_TYPE_GHS_ADD = 1;
     //零售采购生成
     const ORDER_TYPE_HD_ADD = 2;
@@ -61,7 +61,7 @@ class PurchaseClass extends BaseClass
         $productList = self::mergeItemInfo($productList);
         $data['kindNum'] = count($productList); //多少种花材
 
-        //传过滤的productId 是供货商的,需要转换为零售端(hd)的productId
+        //传过滤的productId 是供应商的,需要转换为零售端(hd)的productId
         //补充了hdProductId
         //[{"productId":"113","bigNum":1,"smallNum":0,"classId":"-2","hdProductId":1}]
         $shopId = $data['shopId'] ?? 0;

biz-hd/purchase/classes/PurchaseClearClass.php

@@ -43,7 +43,7 @@ class PurchaseClearClass extends BaseClass
                 util::fail('请选择有欠款的采购单');
             }
             if ($purchase->ghsId != $currentGhsId) {
-                util::fail('请选择同个供货商的订单');
+                util::fail('请选择同个供应商的订单');
             }
             $totalPrice = bcadd($totalPrice, $purchase->realPrice, 2);
             $saleId = $purchase->saleId;
@@ -93,11 +93,11 @@ class PurchaseClearClass extends BaseClass
         $purchaseIds = $order->purchaseIds;
         $arr = explode(',', $purchaseIds);
 
-        //供货商欠款变更
+        //供应商欠款变更
         $ghsId = $order->ghsId;
         $ghs = GhsClass::getLockById($ghsId);
         if (empty($ghs)) {
-            util::fail('没有找到供货商信息');
+            util::fail('没有找到供应商信息');
         }
         $currentAmount = bcsub($ghs->debtAmount, $order->actPrice, 2);
         $ghs->debtAmount = $currentAmount;
@@ -108,9 +108,9 @@ class PurchaseClearClass extends BaseClass
         $shopId = $ghs->shopId;
         $shop = ShopClass::getLockById($shopId);
         if (empty($shop)) {
-            util::fail('没有找到供货商门店');
+            util::fail('没有找到供应商门店');
         }
-        //供货商的门店余额增加
+        //供应商的门店余额增加
         if ($payWay == dict::getDict('payWay', 'wxPay')) {
             $balance = bcadd($shop->balance, $order->actPrice, 2);
             $txBalance = bcadd($shop->txBalance, $order->actPrice, 2);
@@ -135,7 +135,7 @@ class PurchaseClearClass extends BaseClass
             ];
             ShopYeChangeClass::addChange($change, true);
         }
-        //供货商的门店应收客户款减少
+        //供应商的门店应收客户款减少
         $currentGathering = bcsub($shop->mayGathering, $order->actPrice, 2);
         $shop->mayGathering = $currentGathering;
         $shop->save();
@@ -162,7 +162,7 @@ class PurchaseClearClass extends BaseClass
         //销售单状态变化
         OrderClass::updateByIds($saleIds, ['debt' => OrderClass::DEBT_NO, 'clearId' => $clearId]);
 
-        //供货商的客户欠款变化
+        //供应商的客户欠款变化
         $customId = $ghs->customId;
         $custom = CustomClass::getLockById($customId);
         if (empty($custom)) {
@@ -178,7 +178,7 @@ class PurchaseClearClass extends BaseClass
             $shop->save();
         }
 
-        //客户门店应付供货商款减少
+        //客户门店应付供应商款减少
         $customShopId = $custom->shopId;
         $customShop = ShopClass::getLockById($customShopId);
         if (empty($customShop)) {

biz-hd/purchase/services/PurchaseService.php

@@ -33,7 +33,7 @@ class PurchaseService extends BaseService
         //零售采购单
         $respond = PurchaseClass::addPurchase($data);
 
-        //供货商销售单
+        //供应商销售单
         $ghsId = $data['ghsId'] ?? 0;
         $currentShopId = $ghs['shopId'] ?? 0;
         $currentSjId = $ghs['sjId'] ?? 0;
@@ -50,7 +50,7 @@ class PurchaseService extends BaseService
         $purchaseId = $respond->id ?? 0;
         $shopAdminId = $data['shopAdminId'] ?? 0;
         $shopAdminName = $data['shopAdminName'] ?? '';
-        //客户采购时选了自取，则供货商的销售单就是自取
+        //客户采购时选了自取，则供应商的销售单就是自取
         $sendType = OrderClass::SEND_TYPE_UNKNOWN;
         $getType = $data['getType'] ?? PurchaseClass::GET_TYPE_SELF_GET;
         if ($getType == PurchaseClass::GET_TYPE_SELF_GET) {
@@ -254,7 +254,7 @@ class PurchaseService extends BaseService
         $shop->cgUnPay -= 1;
         $shop->cgUnSend += 1;
         if ($payWay == dict::getDict('payWay', 'debtPay')) {
-            //欠款支付会增加【应付供货商款】
+            //欠款支付会增加【应付供应商款】
             $currentMayPay = bcadd($shop->mayPay, $realPrice, 2);
             $shop->mayPay = $currentMayPay;
         }
@@ -290,11 +290,11 @@ class PurchaseService extends BaseService
             $coupon->save();
         }
 
-        /**零售的供货商资产变化**/
+        /**零售的供应商资产变化**/
         $ghsId = $info->ghsId ?? 0;
         $ghs = GhsClass::getLockById($ghsId);
         if (empty($ghs)) {
-            util::fail('没有找到供货商');
+            util::fail('没有找到供应商');
         }
         if ($payWay == dict::getDict('payWay', 'debtPay')) {
             //欠款支付

biz-hd/saas/classes/ApplyClass.php

@@ -21,7 +21,7 @@ class ApplyClass extends BaseClass
 
     //来自零售平台
     const FROM_RETAIL = 1;
-    //来自供货商平台
+    //来自供应商平台
     const FROM_GHS = 2;
 
     const STATUS_CHECKING = 1;
@@ -79,7 +79,7 @@ class ApplyClass extends BaseClass
         $data['fullAddress'] = $city . $dist . $address . $floor;
         $data['style'] = SjClass::STYLE_RETAIL;
         $respond = self::addApply($data);
-        //供货商添加客户的不需要通知
+        //供应商添加客户的不需要通知
         if (isset($data['replace']) && $data['replace'] == 0) {
             $mobile = $data['mobile'];
             $text = "零售商 {$mobile} 已提交资料，";
@@ -104,7 +104,7 @@ class ApplyClass extends BaseClass
         $respond = self::addApply($data);
         if (isset($data['replace']) && $data['replace'] == 0) {
             $mobile = $data['mobile'];
-            $text = "供货商 {$mobile} 已提交资料，";
+            $text = "供应商 {$mobile} 已提交资料，";
             if (isset($data['introSjName']) && !empty($data['introSjName'])) {
                 $text .= "介绍人：{$data['introSjName']}，";
             }

biz-hd/saas/services/ApplyService.php

@@ -154,7 +154,7 @@ class ApplyService extends BaseService
         return $respond;
     }
 
-    //供货商申请开店 ssh 2021.01.28
+    //供应商申请开店 ssh 2021.01.28
     public static function replaceGhs($data)
     {
         $mobile = $data['mobile'] ?? 0;
@@ -215,7 +215,7 @@ class ApplyService extends BaseService
         return $respond;
     }
 
-    //供货商申请开店 ssh 2021.01.28
+    //供应商申请开店 ssh 2021.01.28
     public static function replaceKmGhs($data)
     {
         $mobile = $data['mobile'] ?? 0;

biz-hd/wx/classes/WxOpenClass.php

@@ -96,7 +96,7 @@ class WxOpenClass extends BaseClass
     {
         $open = self::getByCondition(['style' => dict::getDict('ptStyle','ghs')]);
         if (empty($open)) {
-            util::fail('没有找到供货商平台信息...');
+            util::fail('没有找到供应商平台信息...');
         }
         $wxBaseId = isset($open['wxBaseId']) ? $open['wxBaseId'] : 0;
         $base = WxBaseClass::getById($wxBaseId);
@@ -111,7 +111,7 @@ class WxOpenClass extends BaseClass
     {
         $open = self::getByCondition(['style' => dict::getDict('ptStyle','ghs')]);
         if (empty($open)) {
-            util::fail('没有找到供货商平台信息...');
+            util::fail('没有找到供应商平台信息...');
         }
         $wxMiniBaseId = isset($open['wxMiniBaseId']) ? $open['wxMiniBaseId'] : 0;
         $base = WxMiniBaseClass::getById($wxMiniBaseId);
@@ -139,7 +139,7 @@ class WxOpenClass extends BaseClass
     {
         $open = self::getByCondition(['style' => dict::getDict('ptStyle','mall')]);
         if (empty($open)) {
-            util::fail('没有找到供货商平台信息...');
+            util::fail('没有找到供应商平台信息...');
         }
         $wxMiniBaseId = isset($open['wxMiniBaseId']) ? $open['wxMiniBaseId'] : 0;
         $base = WxMiniBaseClass::getById($wxMiniBaseId);
@@ -154,7 +154,7 @@ class WxOpenClass extends BaseClass
     {
         $open = self::getByCondition(['style' => dict::getDict('ptStyle','mall')]);
         if (empty($open)) {
-            util::fail('没有找到供货商平台信息...');
+            util::fail('没有找到供应商平台信息...');
         }
         $wxBaseId = isset($open['wxBaseId']) ? $open['wxBaseId'] : 0;
         $base = WxBaseClass::getById($wxBaseId);

biz/ghs/classes/GhsClass.php

@@ -19,7 +19,7 @@ class GhsClass extends BaseClass
 
     public static $baseFile = '\biz\ghs\models\Ghs';
 
-    //新增客户和供货商关系 shish 2021.4.13
+    //新增客户和供应商关系 shish 2021.4.13
     public static function build($ghsShopId, $hdShopId, $type = 1)
     {
         if ($type == 1) {
@@ -91,15 +91,15 @@ class GhsClass extends BaseClass
         return $custom;
     }
 
-    //增加供货商 shish 2021.3.29
+    //增加供应商 shish 2021.3.29
     public static function addGhs($data)
     {
-        //供货商客户+1
+        //供应商客户+1
         ShopService::totalUserPlus($data['shopId']);
         return self::add($data);
     }
 
-    //供货商列表 ssh 2021.1.24
+    //供应商列表 ssh 2021.1.24
     public static function getGhsList($where)
     {
         $data = self::getList('*', $where, 'addTime DESC');
@@ -107,7 +107,7 @@ class GhsClass extends BaseClass
         return $data;
     }
 
-    //根据xhSupplier的id数组 取供货商信息 ssh 2021.1.18
+    //根据xhSupplier的id数组 取供应商信息 ssh 2021.1.18
     public static function getGhsByIds($ids)
     {
         $list = self::getByIds($ids, null, 'id');
@@ -134,7 +134,7 @@ class GhsClass extends BaseClass
         return $list;
     }
 
-    //根据供货商信息 ssh 2021.1.18
+    //根据供应商信息 ssh 2021.1.18
     public static function getGhsInfo($id)
     {
         $info = self::getById($id);

biz/pt/classes/PtAssetClass.php

@@ -236,7 +236,7 @@ class PtAssetClass extends BaseClass
         return $asset;
     }
 
-    //供货商平台余额对象 shish 20210519
+    //供应商平台余额对象 shish 20210519
     public static function getGhsBalance()
     {
         $ghs = dict::getDict('ptAsset', 'ghsBalance');
@@ -248,7 +248,7 @@ class PtAssetClass extends BaseClass
             self::add($data);
             $asset = self::getLockById($id);
             if (empty($asset)) {
-                util::fail('没有找到供货商平台余额，请先创建');
+                util::fail('没有找到供应商平台余额，请先创建');
             }
         }
         return $asset;
@@ -272,7 +272,7 @@ class PtAssetClass extends BaseClass
         return $asset;
     }
 
-    //供货商平台余额对象 shish 20210519
+    //供应商平台余额对象 shish 20210519
     public static function getGhsTxBalance()
     {
         $txGhs = dict::getDict('ptAsset', 'ghsTxBalance');
@@ -284,7 +284,7 @@ class PtAssetClass extends BaseClass
             self::add($data);
             $asset = self::getLockById($id);
             if (empty($asset)) {
-                util::fail('没有找到供货商平台可提现余额，请先创建');
+                util::fail('没有找到供应商平台可提现余额，请先创建');
             }
         }
         return $asset;

biz/sj/classes/SjClass.php

@@ -13,15 +13,15 @@ class SjClass extends BaseClass
 
     //零售店
     const STYLE_RETAIL = 1;
-    //供货商
+    //供应商
     const STYLE_SUPPLIER = 2;
-    //昆明供货商
+    //昆明供应商
     const STYLE_KM_SUPPLIER = 3;
 
     const STYLE_LIST = [
         self::STYLE_RETAIL => '花店',
-        self::STYLE_SUPPLIER => '供货商',
-        self::STYLE_KM_SUPPLIER => '昆明供货商',
+        self::STYLE_SUPPLIER => '供应商',
+        self::STYLE_KM_SUPPLIER => '昆明供应商',
     ];
 
     //续期一年 shish 2021.4.25

biz/sj/services/MerchantService.php

@@ -77,13 +77,13 @@ class MerchantService extends BaseService
         $applyData['address'] = $applyData['address'] ?? '';
         $applyData['agentLevel'] = 1;
         $applyData['parentId'] = $applyData['introSjId'] ?? 0;
-        //免费试用，区分供货商（一年） 零售商（15天）
+        //免费试用，区分供应商（一年） 零售商（15天）
         $deadline = time() + 7 * 86400; //默认其他
         if ($applyData['style'] == SjClass::STYLE_RETAIL) {
             $deadline = time() + 15 * 86400; //零售商（15天）
         }
         if ($applyData['style'] == SjClass::STYLE_SUPPLIER) {
-            $deadline = time() + 365 * 86400; //区分供货商（一年）
+            $deadline = time() + 365 * 86400; //区分供应商（一年）
         }
         $applyData['deadline'] = date("Y-m-d H:i:s", $deadline);
         $applyData['parentId'] = $applyData['introSjId'] ?? 0;
@@ -173,7 +173,7 @@ class MerchantService extends BaseService
         $shopRespond = \biz\shop\classes\ShopClass::addShop($shopData);
         $shopId = $shopRespond->id;
 
-        //非供货商添加客户生成的申请才初始化其它基础信息
+        //非供应商添加客户生成的申请才初始化其它基础信息
         if (isset($applyData['replace']) && $applyData['replace'] == 0) {
             //员工、角色、商品、分类、培训班、花材等初始化
             MerchantClass::initMore($applyData, $sjId, $shopId);
@@ -186,7 +186,7 @@ class MerchantService extends BaseService
         $sjData['status'] = $sjStatus;
         MerchantClass::updateById($sjId, $sjData);
 
-        //建立供货商和客户关系
+        //建立供应商和客户关系
         CustomService::shareBuildTrade($applyData, $shopRespond);
 
         // 赠送零售商优惠券

biz/wx/classes/WxMessageClass.php

@@ -32,7 +32,7 @@ class WxMessageClass extends BaseClass
                 'OPENTM411207151' => '提现成功通知',
                 'OPENTM416881153' => '发货通知',
             ],
-            //供货商
+            //供应商
             dict::getDict('ptStyle', 'ghs') => [
                 'OPENTM417875155' => '新订单通知',
                 'OPENTM207430125' => '操作成功通知',
@@ -280,7 +280,7 @@ class WxMessageClass extends BaseClass
         }
     }
 
-    //零售清算欠款通知供货商 shish 20210531
+    //零售清算欠款通知供应商 shish 20210531
     public static function clearInform($shop, $order, $custom)
     {
         $shopId = $shop->id;

biz/wx/classes/WxOpenClass.php

@@ -29,7 +29,7 @@ class WxOpenClass extends BaseClass
         return $arr;
     }
 
-    //取供货商平台信息 ssh 2021.2.25
+    //取供应商平台信息 ssh 2021.2.25
     public static function getGhsOpen()
     {
         return self::getByCondition(['style' => dict::getDict('ptStyle', 'ghs')]);

common/components/dict.php

@@ -20,9 +20,9 @@ class dict
         //平台资产
         'ptAsset' => [
             'hdBalance' => ['id' => 1, 'name' => '零售余额'],
-            'ghsBalance' => ['id' => 2, 'name' => '供货商余额'],
+            'ghsBalance' => ['id' => 2, 'name' => '供应商余额'],
             'hdTxBalance' => ['id' => 3, 'name' => '零售可提现'],
-            'ghsTxBalance' => ['id' => 4, 'name' => '供货商可提现'],
+            'ghsTxBalance' => ['id' => 4, 'name' => '供应商可提现'],
         ],
 
         //支付方式的类型 1商家开单选的支付方式 2客户在线支付
@@ -34,12 +34,12 @@ class dict
         //需要显示国兰的信息 0不需要 1需要（需要提交审核小程序时请显示国兰信息）
         'showGlInfo' => 0,
 
-        //显示零售和供货商的演示入口 0不需要 1需要
+        //显示零售和供应商的演示入口 0不需要 1需要
         'showDemo' => 1,
 
         //零售演示的管理员id
         'hdDemoAdminId' => 427,
-        //供货商演示的管理员id
+        //供应商演示的管理员id
         'ghsDemoAdminId' => 428,
         'expressList' => [
             [
@@ -61,9 +61,9 @@ class dict
         //所属平台类型
         'ptStyle' => [
             'hd' => 1,//零售花店
-            'ghs' => 2,//供货商
+            'ghs' => 2,//供应商
             'mall' => 3,//商城
-            'kmGhs' => 4,//昆明供货商
+            'kmGhs' => 4,//昆明供应商
         ],
 
         'merchantStatus' => ['checking' => 0, 'pass' => 1, 'noPass' => 2, 'freeze' => 3, 'unfreeze' => 4, 'shut' => 5],
@@ -131,7 +131,7 @@ class dict
             'xhApplyOrder' => ['id' => 7, 'name' => 'xhApplyOrder'],
             'xhMergeUser' => ['id' => 8, 'name' => 'xhMergeUser'],
             'xhRenew' => ['id' => 9, 'name' => 'xhRenew'],
-            //供货商订单
+            //供应商订单
             'xhGhsOrder' => ['id' => 10, 'name' => 'xhGhsOrder'],
             //花店采购
             'xhPurchase' => ['id' => 11, 'name' => 'xhPurchase'],
@@ -139,11 +139,11 @@ class dict
             'pxApply' => ['id' => 12, 'name' => 'pxApply'],
             //花店采购结算
             'hdPurchaseClear' => ['id' => 20, 'name' => 'hdPurchaseClear'],
-            //供货商采购
+            //供应商采购
             'ghsPurchase' => ['id' => 25, 'name' => 'ghsPurchase'],
-            //供货商出库
+            //供应商出库
             'ghsCheckOut' => ['id' => 26, 'name' => 'ghsCheckOut'],
-            //供货商入库
+            //供应商入库
             'ghsCheckIn' => ['id' => 27, 'name' => 'ghsCheckIn'],
             'usePtCoupon' => ['id' => 30, 'name' => 'usePtCoupon'],
         ],

common/components/imgUtil.php

@@ -16,7 +16,7 @@ class imgUtil
     //获取图片路径的前缀 ssh 2021.3.12
     public static function getPrefix()
     {
-        //$style 1花店 2供货商 3商城
+        //$style 1花店 2供应商 3商城
         $style = Yii::$app->params['ptStyle'];
         if ($style == 2) {
             return Yii::$app->params['ghsImgHost'];

common/components/miniUtil.php

@@ -723,7 +723,7 @@ class miniUtil
                     }
 
                 } elseif ($ptStyle == 2) {
-                    //供货商
+                    //供应商
                     $wxMiniBaseId = isset($open['wxMiniBaseId']) ? $open['wxMiniBaseId'] : 0;
                     if (!empty($wxMiniBaseId)) {
                         WxMiniBaseService::updateById($wxMiniBaseId, $uData);

common/components/orderSn.php

@@ -18,7 +18,7 @@ use yii\imagine\Image;
 class orderSn
 {
 
-    //供货商订单号生成 ssh 2021.1.19
+    //供应商订单号生成 ssh 2021.1.19
     public static function getGhsOrderSn()
     {
         $prefix = 'XSD_CS';
@@ -48,7 +48,7 @@ class orderSn
         return $prefix . $id;
     }
 
-    //供货商采购单号 ssh 2021.1.19
+    //供应商采购单号 ssh 2021.1.19
     public static function getGhsPurchaseSn()
     {
         $prefix = 'PH_CS';
@@ -63,7 +63,7 @@ class orderSn
         return $prefix . $id;
     }
 
-    //供货商盘点单号 ssh 2021.1.19
+    //供应商盘点单号 ssh 2021.1.19
     public static function getGhsCheckSn()
     {
         $prefix = 'PD_CS';
@@ -108,7 +108,7 @@ class orderSn
         return $prefix . $id;
     }
 
-    //供货商入库订单号 linqh 2021.1.23
+    //供应商入库订单号 linqh 2021.1.23
     public static function getGhsStockInSn()
     {
         $prefix = 'RK_CS';
@@ -123,7 +123,7 @@ class orderSn
         return $prefix . $id;
     }
 
-    //供货商出库订单号 linqh 2021.1.23
+    //供应商出库订单号 linqh 2021.1.23
     public static function getGhsStockOutSn()
     {
         $prefix = 'CK_CS';
@@ -153,7 +153,7 @@ class orderSn
         return $prefix . $id;
     }
 
-    //供货商批量结算订单号 ssh 2021.3.15
+    //供应商批量结算订单号 ssh 2021.3.15
     public static function getGhsOrderClearSn()
     {
         // BOC batchOrderClear
@@ -215,7 +215,7 @@ class orderSn
     }
 
 
-    //供货商报损订单号 linqh 2021.6.211
+    //供应商报损订单号 linqh 2021.6.211
     public static function getGhsStockWastageSn()
     {
         $prefix = 'SH_CS';

common/components/payUtil.php

@@ -22,7 +22,7 @@ class payUtil
             //流水类型列表
             switch ($capitalType) {
                 case dict::getDict('capitalType', 'xhRecharge', 'id'):
-                    //零售和供货商充值
+                    //零售和供应商充值
                     RechargeClass::thirdPay($payWay, $orderSn, $totalFee, $attach);
                     break;
                 case dict::getDict('capitalType', 'xhPurchase', 'id'):
@@ -38,7 +38,7 @@ class payUtil
                     OrderClass::thirdPay($payWay, $orderSn, $totalFee, $attach);
                     break;
                 case dict::getDict('capitalType', 'xhRenew', 'id'):
-                    //零售和供货商续费订单
+                    //零售和供应商续费订单
                     RenewClass::thirdPay($payWay, $orderSn, $totalFee, $attach);
                     break;
                 case dict::getDict('capitalType', 'pxApply', 'id'):

common/components/wxUtil.php

@@ -639,7 +639,7 @@ class wxUtil
                 $uData['wxAccessToken'] = $wxAccessToken;
                 $uData['wxAccessTokenTime'] = date("Y-m-d H:i:s", (time() + $expires_in - 100));
                 if (in_array($isOpen, [1, 2, 3])) {
-                    //零售、供货商和商城
+                    //零售、供应商和商城
                     $wxBaseId = $open['wxBaseId'] ?? 0;
                     if (!empty($wxBaseId)) {
                         WxBaseService::updateById($wxBaseId, $uData);
@@ -1245,12 +1245,12 @@ class wxUtil
         $currentHost = Yii::$app->params['hdHost'];
         $imgHost = Yii::$app->params['hdImgHost'];
         if ($isOpen == 2) {
-            //供货商
+            //供应商
             $currentHost = Yii::$app->params['ghsHost'];
             $imgHost = Yii::$app->params['ghsImgHost'];
         }
         if ($isOpen == 3) {
-            //供货商
+            //供应商
             $currentHost = Yii::$app->params['mallHost'];
             $imgHost = Yii::$app->params['mallImgHost'];
         }
@@ -1293,11 +1293,11 @@ class wxUtil
         //零售
         $currentHost = Yii::$app->params['hdHost'];
         if ($isOpen == 2) {
-            //供货商
+            //供应商
             $currentHost = Yii::$app->params['ghsHost'];
         }
         if ($isOpen == 3) {
-            //供货商
+            //供应商
             $currentHost = Yii::$app->params['mallHost'];
         }
         $has = strpos($currentHost, 'https');

common/services/xhPayToolService.php

@@ -58,7 +58,7 @@ class xhPayToolService
         return self::basePay($callbackParams, $orderSn, $totalFee, $capitalType, $couponId, $payWay);
     }
 
-    //供货商订单支付成功 ssh 2021.3.15
+    //供应商订单支付成功 ssh 2021.3.15
     public static function ghsOrderPay($transaction, $callbackParams, $orderSn, $totalFee, $capitalType, $couponId, $payWay, $alipayParams)
     {
         $order = \bizGhs\order\classes\OrderClass::getByCondition(['orderSn' => $orderSn]);
@@ -153,7 +153,7 @@ class xhPayToolService
                     $order = xhApplyOrderService::getById($orderSn);
                     break;
                 case $capitalTypeList['xhGhsOrder']['id']:
-                    //供货商订单
+                    //供应商订单
                     return self::ghsOrderPay($transaction, $callbackParams, $orderSn, $totalFee, $capitalType, $couponId, $payWay, $alipayParams);
                     Yii::$app->end();
                     break;

doc/说明.md

@@ -6,12 +6,12 @@
 saas.huaml.com (平台)        	api.saas.huaml.com
 shop.huaml.com（花店后台）      api.shop.huaml.com
 花美玲 花店小程序   		    api.shop.huaml.com
-花掌柜 供货商小程序			    api.ghs.huaml.com
+花掌柜 供应商小程序			    api.ghs.huaml.com
 
 线上：销花宝 -- 花卉宝
 
 开发：花掌柜 -- 花美玲
 
-isOpen 1 表示零售 2表示供货商
+isOpen 1 表示零售 2表示供应商
 
 ````