花材别名

biz-ghs/admin/classes/AdminClass.php

@@ -66,13 +66,12 @@ class AdminClass extends BaseClass
         $mobile = $applyData['mobile'] ?? 0;
         $adminId = $applyData['adminId'] ?? 0;
         $adminName = $applyData['adminName'] ?? '';
-
         //创建管理员角色
         $roleId = 0;
         $hasRole = AdminRoleClass::getByCondition(['merchantId' => $sjId]);
         if (empty($hasRole)) {
             AdminRoleClass::addAdminRole(['roleName' => '员工', 'merchantId' => $sjId, 'auth' => '']);
-            $roleReturn = AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $sjId, 'auth' => '*']);
+            $roleReturn = AdminRoleClass::addAdminRole(['roleName' => '老板', 'num' => 1, 'merchantId' => $sjId, 'auth' => '*']);
             $roleId = $roleReturn['id'];
         }
         //创建管理员

biz-ghs/custom/classes/CustomClass.php

@@ -17,7 +17,7 @@ class CustomClass extends BaseClass
     public static $baseFile = '\bizGhs\custom\models\Custom';
 
     //申请开店建立客户关系 ssh 2021.2.28
-    public static function buildCustom($applyData, $sjId, $shopId, $isOpen)
+    public static function buildCustom($applyData, $sjId, $shopId)
     {
         if ($applyData['style'] == SjClass::STYLE_RETAIL) {
             if ($applyData['introStyle'] == SjClass::STYLE_SUPPLIER) {
@@ -29,7 +29,7 @@ class CustomClass extends BaseClass
                         'sjId' => $applyData['introSjId'],
                         'name' => $applyData['name'],
                         'mobile' => $applyData['mobile'],
-                        'isOpen' => $isOpen,
+                        'isOpen' => 1,
                         'province' => $applyData['province'] ?? '',
                         'city' => $applyData['city'] ?? '',
                         'dist' => $applyData['dist'] ?? '',

biz-hd/admin/classes/AdminClass.php

@@ -49,7 +49,7 @@ class AdminClass extends BaseClass
         $adminName = $applyData['adminName'] ?? '';
         //创建角色，角色区分暂时可以通过auth值为区分
         AdminRoleClass::addAdminRole(['roleName' => '员工', 'merchantId' => $sjId, 'auth' => '']);
-        $roleReturn = AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $sjId, 'auth' => '*']);
+        $roleReturn = AdminRoleClass::addAdminRole(['roleName' => '老板', 'merchantId' => $sjId, 'num' => 1, 'auth' => '*']);
         $roleId = $roleReturn['id'];
         //创建管理员身份
         if (!empty($adminId)) {

biz/item/classes/PtItemClass.php

@@ -136,12 +136,12 @@ class PtItemClass extends BaseClass
             $upData['cover'] = $data['cover'];
             $syncCover = true;
         }
-//        if (isset($data['alias'])) {
-//            if (empty($data['alias'])) {
-//                util::fail("请输入花材别名");
-//            }
-//            $upData['alias'] = $data['alias'];
-//        }
+        if (isset($data['alias'])) {
+            if (empty($data['alias'])) {
+                util::fail("请输入花材别名");
+            }
+            $upData['alias'] = $data['alias'];
+        }
         if (isset($data['cost'])) {
             if (empty($data['cost'])) {
                 util::fail("请输入花材成本价");

biz/sj/classes/MerchantClass.php

@@ -37,7 +37,7 @@ class MerchantClass extends BaseClass
     public static function initMore($applyData, $sjId, $shopId)
     {
         if ($applyData['style'] == SjClass::STYLE_RETAIL) {
-            self::initRetailMore($applyData, $sjId, $shopId);
+            self::initHdMore($applyData, $sjId, $shopId);
         }
         if ($applyData['style'] == SjClass::STYLE_SUPPLIER) {
             self::initGhsMore($applyData, $sjId, $shopId);
@@ -46,7 +46,7 @@ class MerchantClass extends BaseClass
         }
     }
 
-    public static function initRetailMore($applyData, $sjId, $shopId)
+    public static function initHdMore($applyData, $sjId, $shopId)
     {
         //初始化员工和角色
         AdminClass::initAdmin($applyData, $sjId, $shopId);
@@ -62,9 +62,6 @@ class MerchantClass extends BaseClass
     {
         //初始化员工和角色
         \bizGhs\admin\classes\AdminClass::initAdmin($applyData, $sjId, $shopId);
-
-        //初始化花材， ghsItemClass, ghsItem  ghsProduct
-
     }
 
     //商家信息组合 ssh 2019.12.20

biz/sj/services/MerchantService.php

@@ -47,7 +47,7 @@ class MerchantService extends BaseService
         }
         $customSjId = $custom['customSjId'] ?? 0;
         $customShopId = $custom['customShopId'] ?? 0;
-        MerchantClass::initRetailMore($apply, $customSjId, $customShopId);
+        MerchantClass::initHdMore($apply, $customSjId, $customShopId);
         //标识有客户关系的开店状态
         CustomClass::updateByCondition(['customSjId' => $customSjId], ['isOpen' => 1]);
     }
@@ -76,10 +76,10 @@ class MerchantService extends BaseService
         //15天免费试用
         //区分供货商（一年） 零售商（15天）
         $deadline = time() + 7 * 86400; //默认其他
-        if ($applyData['style'] == SjClass::STYLE_RETAIL){
+        if ($applyData['style'] == SjClass::STYLE_RETAIL) {
             $deadline = time() + 15 * 86400; //零售商（15天）
         }
-        if ($applyData['style'] == SjClass::STYLE_SUPPLIER){
+        if ($applyData['style'] == SjClass::STYLE_SUPPLIER) {
             $deadline = time() + 365 * 86400; //区分供货商（一年）
         }
         $applyData['deadline'] = date("Y-m-d H:i:s", $deadline);
@@ -159,26 +159,18 @@ class MerchantService extends BaseService
         $shopRespond = ShopClass::addShop($shopData);
         $shopId = $shopRespond['id'];
 
-        //有营业执照时才初始化的信息
-        $isOpen = 0;
+        //员工、角色、商品、分类等等初始化
+        MerchantClass::initMore($applyData, $sjId, $shopId);
+
         $sjData = [];
         $sjData['defaultShopId'] = $shopId;
-        $sjStatus = MerchantClass::STATUS_FREEZE;
-        if (isset($applyData['licenseNo']) && !empty($applyData['licenseNo'])) {
-
-            //员工角色、商品、分类等等初始化
-            MerchantClass::initMore($applyData, $sjId, $shopId);
-
-            $isOpen = 1;
-            $sjStatus = MerchantClass::STATUS_HAS_CHECK;
-        }
-
+        $sjStatus = MerchantClass::STATUS_HAS_CHECK;
         //变更状态和设置商家的默认门店
         $sjData['status'] = $sjStatus;
         MerchantClass::updateById($sjId, $sjData);
 
         //建立客户关系
-        CustomClass::buildCustom($applyData, $sjId, $shopId, $isOpen);
+        CustomClass::buildCustom($applyData, $sjId, $shopId);
 
         return $sj;
     }