Browse Source

开通与注册

shish 4 years ago
parent
commit
aa18889964
41 changed files with 1053 additions and 488 deletions
  1. 1 2
      app-ghs/controllers/GhsController.php
  2. 6 4
      app-pt/controllers/ApplyController.php
  3. 19 0
      biz-ghs/apply/classes/ApplyClass.php
  4. 13 0
      biz-ghs/apply/models/Apply.php
  5. 54 0
      biz-ghs/apply/services/ApplyService.php
  6. 7 0
      biz-ghs/merchant/classes/MerchantClass.php
  7. 3 20
      biz-ghs/merchant/classes/ShopClass.php
  8. 129 0
      biz-ghs/merchant/services/MerchantService.php
  9. 45 0
      biz-ghs/shop/classes/ShopClass.php
  10. 15 0
      biz-ghs/shop/models/Shop.php
  11. 14 0
      biz-ghs/shop/services/ShopService.php
  12. 1 25
      biz-hd/merchant/classes/ShopClass.php
  13. 29 0
      biz-hd/merchant/classes/SjAssetClass.php
  14. 36 0
      biz-hd/merchant/classes/SjClass.php
  15. 29 0
      biz-hd/merchant/classes/SjExtendClass.php
  16. 29 0
      biz-hd/merchant/classes/SjInitClass.php
  17. 13 0
      biz-hd/merchant/models/Sj.php
  18. 13 0
      biz-hd/merchant/models/SjAsset.php
  19. 13 0
      biz-hd/merchant/models/SjExtend.php
  20. 13 0
      biz-hd/merchant/models/SjInit.php
  21. 18 0
      biz-hd/merchant/services/SjAssetService.php
  22. 144 0
      biz-hd/merchant/services/SjService.php
  23. 6 42
      biz-hd/saas/services/ApplyService.php
  24. 56 0
      biz-hd/shop/classes/ShopClass.php
  25. 13 0
      biz-hd/shop/models/Shop.php
  26. 13 0
      biz-hd/shop/services/ShopService.php
  27. 11 0
      biz-jd/apply/classes/ApplyClass.php
  28. 13 0
      biz-jd/apply/models/Apply.php
  29. 31 0
      biz-jd/apply/services/ApplyService.php
  30. 9 0
      biz-jd/base/classes/BaseClass.php
  31. 8 0
      biz-jd/base/models/Base.php
  32. 8 0
      biz-jd/base/services/BaseService.php
  33. 42 0
      biz-jd/shop/classes/ShopClass.php
  34. 13 0
      biz-jd/shop/models/Shop.php
  35. 13 0
      biz-jd/shop/services/ShopService.php
  36. 12 0
      biz-jd/sj/classes/SjClass.php
  37. 15 0
      biz-jd/sj/models/Sj.php
  38. 144 0
      biz-jd/sj/services/SjService.php
  39. 0 28
      biz/shop/classes/ShopClass.php
  40. 1 367
      biz/sj/services/MerchantService.php
  41. 1 0
      common/config/bootstrap.php

+ 1 - 2
app-ghs/controllers/GhsController.php

@@ -90,8 +90,7 @@ class GhsController extends BaseController
             ];
             $apply = ApplyService::replaceKmGhs($applyData);
             $id = $apply['id'] ?? 0;
-            $respond = ApplyService::pass($id);
-
+            $respond = \bizJd\apply\services\ApplyService::pass($id);
             $shop = $respond['shop'] ?? [];
             $sj = $respond['sj'] ?? [];
             $currentSjId = $sj['id'] ?? 0;

+ 6 - 4
app-pt/controllers/ApplyController.php

@@ -2,12 +2,11 @@
 
 namespace pt\controllers;
 
-use biz\sj\classes\MerchantClass;
 use bizHd\saas\services\ApplyService;
+use common\components\dict;
 use common\components\sms;
 use common\components\util;
 use Yii;
-use yii\web\Controller;
 
 
 class ApplyController extends BaseController
@@ -39,18 +38,21 @@ class ApplyController extends BaseController
         if (isset($apply['status']) && $apply['status'] == 2) {
             util::fail('已经审过了');
         }
+        if ($apply->style == dict::getDict('ptStyle', 'ghs')) {
+            util::fail('暂时只支持审核批发商的申请');
+        }
         $connection = Yii::$app->db;
         $transaction = $connection->beginTransaction();
         try {
             ApplyService::updateById($id, ['status' => $status, 'remark' => $remark]);
             if ($status == 1) {
-                ApplyService::pass($id);
+                \bizGhs\apply\services\ApplyService::pass($id);
             }
             $transaction->commit();
             if ($status == 1) {
                 $mobile = $apply['mobile'] ?? '';
                 $cf = '15280215347';
-                sms::freeSend($mobile. ',' . $cf , '恭喜,开店申请审核通过了,登录后请及时修改密码,如有疑问请联系 {$var}');
+                sms::freeSend($mobile . ',' . $cf, '恭喜,开店申请审核通过了,登录后请及时修改密码,如有疑问请联系 {$var}');
             }
         } catch (\Exception $exception) {
             $transaction->rollBack();

+ 19 - 0
biz-ghs/apply/classes/ApplyClass.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace bizGhs\admin\classes;
+
+use Yii;
+use bizGhs\base\classes\BaseClass;
+
+class ApplyClass extends BaseClass
+{
+
+    public static $baseFile = '\bizGhs\apply\models\Apply';
+
+    const STATUS_CHECKING = 1;
+    const STATUS_PASS = 2;
+    const STATUS_UN_PASS = 3;
+    const STATUS_HAS_PAY = 4;
+    const STATUS_EXPIRE = 5;
+
+}

+ 13 - 0
biz-ghs/apply/models/Apply.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizGhs\apply\models;
+use bizGhs\base\models\Base;
+
+class Apply extends Base
+{
+
+    public static function tableName()
+    {
+        return 'xhApply';
+    }
+
+}

+ 54 - 0
biz-ghs/apply/services/ApplyService.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace bizGhs\apply\services;
+
+use biz\shop\classes\MainClass;
+use bizGhs\admin\classes\ApplyClass;
+use bizGhs\merchant\services\MerchantService;
+use bizHd\merchant\services\SjService;
+use common\components\dict;
+use common\components\util;
+use Yii;
+use bizGhs\base\services\BaseService;
+
+class ApplyService extends BaseService
+{
+
+    public static $baseFile = '\bizGhs\apply\classes\ApplyClass';
+
+    //审核通过,商家初始化 ssh 2021.2.23
+    public static function pass($id, $remark = '')
+    {
+        $apply = ApplyClass::getById($id);
+        if (empty($apply)) {
+            util::fail('没有找到申请记录');
+        }
+        $applyId = $apply['id'];
+        ApplyClass::updateById($applyId, ['status' => ApplyClass::STATUS_PASS, 'remark' => $remark]);
+        $apply['name'] = isset($apply['name']) ? $apply['name'] : '';
+        $main = MainClass::add(['id' => null], true);
+        $mainId = $main->id ?? 0;
+        $respond = [];
+        $style = $apply['style'] ?? dict::getDict('ptStyle', 'hd');
+
+        $respond = MerchantService::initGhsBaseInfo($apply, $main, true);
+        $shop = $respond['shop'] ?? [];
+
+        $ret = SjService::initHdBaseInfo($apply, $main);
+        $shop2 = $ret['shop'] ?? [];
+
+        $shop2->pfShopId = $shop->id ?? 0;
+        $shop2->save();
+
+        $shop->lsShopId = $shop2->id ?? 0;
+        $shop->save();
+
+        //初始化员工和角色
+        \bizGhs\admin\classes\AdminClass::initAdmin($apply, $mainId, $shop, $shop2);
+        //初始化花材
+        \bizGhs\item\services\ItemService::initItem($mainId);
+
+        return $respond;
+    }
+
+}

+ 7 - 0
biz-ghs/merchant/classes/MerchantClass.php

@@ -18,6 +18,13 @@ use bizHd\base\classes\BaseClass;
 class MerchantClass extends BaseClass
 {
 
+    //状态
+    const STATUS_UN_CHECK = 0;
+    const STATUS_HAS_CHECK = 1;
+    const STATUS_CHECK_NOT_PASS = 2;
+    const STATUS_FREEZE = 3;
+    const STATUS_EXPIRE = 4;
+
     public static $baseFile = '\bizGhs\merchant\models\Merchant';
 
     //常用链接

+ 3 - 20
biz-ghs/merchant/classes/ShopClass.php

@@ -57,7 +57,8 @@ class ShopClass extends BaseClass
         $main = MainClass::add(['id' => null], true);
         $mainId = $main->id ?? 0;
         $data['mainId'] = $mainId;
-        $newShop = self::addShop($data);
+
+        $newShop = \bizGhs\shop\classes\ShopClass::addShop($data);
 
         //从首店复制花材和分类
         \bizGhs\item\services\ItemService::copyItem($defaultMainId, $mainId);
@@ -69,7 +70,7 @@ class ShopClass extends BaseClass
         $lsOldShop = ShopClass::getById($oldShop->lsShopId, true);
         $data['sjId'] = $lsOldShop->sjId ?? 0;
         $data['ptStyle'] = dict::getDict('ptStyle', 'hd');
-        $lsNewShop = \biz\shop\classes\ShopClass::addShop($data);
+        $lsNewShop = \bizGhs\shop\classes\ShopClass::addShop($data);
         //初始化员工和角色
         $initAdminData = ['mobile' => $mobile, 'adminId' => $adminId];
         \bizGhs\admin\classes\AdminClass::initAdmin($initAdminData, $mainId, $lsNewShop);
@@ -109,24 +110,6 @@ class ShopClass extends BaseClass
         return isset($merchant['defaultShopId']) ? $merchant['defaultShopId'] : 0;
     }
 
-    //创建门店 ssh 2021.1.14
-    public static function addShop($data)
-    {
-        $data['createTime'] = date("Y-m-d H:i:s");
-        $shopName = isset($data['shopName']) ? $data['shopName'] : '';
-        if (empty($shopName)) {
-            util::fail('请填写门店名称');
-        }
-        $exists = self::getByCondition(['sjId' => $data['sjId'], 'shopName' => $shopName]);
-        if (!empty($exists)) {
-            util::fail('门店名称已经存在');
-        }
-        //补充fullAddress lqh 2021.4.18
-        $data['fullAddress'] = $data['city'] . $data['address'] . $data['floor'];
-        $shop = self::add($data);
-        return $shop;
-    }
-
     //取商家所有门店 ssh 2020.2.29
     public static function getAllShop($sjId)
     {

+ 129 - 0
biz-ghs/merchant/services/MerchantService.php

@@ -2,6 +2,9 @@
 
 namespace bizGhs\merchant\services;
 
+use bizGhs\admin\classes\ApplyClass;
+use bizGhs\custom\services\CustomService;
+use bizGhs\merchant\classes\MerchantInitClass;
 use bizHd\admin\classes\AdminRoleClass;
 use bizHd\agent\classes\AgentAssetClass;
 use bizHd\auth\services\AuthService;
@@ -18,6 +21,8 @@ use bizHd\user\services\UserService;
 use bizHd\wx\classes\WxOpenClass;
 use bizHd\wx\services\WxMenuService;
 use common\components\business;
+use common\components\dict;
+use common\components\stringUtil;
 use common\components\util;
 use common\services\xhTMessageService;
 use common\services\xhWxMenuService;
@@ -28,6 +33,130 @@ class MerchantService extends BaseService
 
     public static $baseFile = '\bizGhs\merchant\classes\MerchantClass';
 
+    //初始化商家信息 ssh 2020.2.11
+    public static function initGhsBaseInfo($applyData, $main, $applyThis = false)
+    {
+        $applyId = $applyData['id'] ?? 0;
+        $mainId = $main->id ?? 0;
+        unset($applyData['id']);
+
+        //生成商家
+        $applyData['accountStyle'] = 0;
+        $applyData['status'] = 1;
+        $applyData['lat'] = $applyData['lat'] ?? (string)0;
+        $applyData['long'] = $applyData['long'] ?? (string)0;
+        $applyData['precision'] = (string)0;
+        $applyData['wxToken'] = stringUtil::buildWxToken(0);
+        $applyData['photoList'] = $applyData['photoList'] ?? '';
+        $applyData['name'] = $applyData['name'] ?? '';
+        $applyData['province'] = $applyData['province'] ?? '';
+        $applyData['city'] = $applyData['city'] ?? '';
+        $applyData['dist'] = $applyData['dist'] ?? '';
+        $applyData['address'] = $applyData['address'] ?? '';
+        $applyData['agentLevel'] = 1;
+        $applyData['parentId'] = $applyData['introSjId'] ?? 0;
+        $deadline = time() + 365 * 86400;
+        $applyData['deadline'] = date("Y-m-d H:i:s", $deadline);
+        $applyData['parentId'] = $applyData['introSjId'] ?? 0;
+        $applyData['parentShopId'] = $applyData['introShopId'] ?? 0;
+
+
+        $sjData = $applyData;
+        $sjData['style'] = dict::getDict('ptStyle', 'ghs');
+        $sj = self::add($sjData, true);
+        $sjId = $sj->id;
+        $sjName = $sj->name ?? 0;
+        $mobile = $applyData['mobile'] ?? '';
+        $ptStyle = $applyData['style'] ?? dict::getDict('ptStyle', 'hd');
+
+        if (!empty($applyId) && $applyThis) {
+            ApplyClass::updateById($applyId, ['sjId' => $sjId]);
+        }
+
+        //生成资产
+        $assetData = [
+            'balance' => 0,
+            'totalVisit' => 0,
+            'totalUser' => 0,
+            'totalMember' => 0,
+            'totalFans' => 0,
+            'totalIntegral' => 0,
+            'totalPoint' => 0,
+            'totalGoods' => 0,
+            'totalRecharge' => 0,
+            'totalOrder' => 0,
+            'totalDeal' => 0,
+            'sjId' => $sjId,
+            'totalIncome' => 0,
+            'totalExpend' => 0,
+        ];
+        MerchantAssetClass::add($assetData);
+
+        //生成商家拓展信息
+        $extendData = [
+            'sjId' => $sjId,
+            'wxAppId' => isset($applyData['wxAppId']) ? $applyData['wxAppId'] : '',
+            'webTitle' => isset($applyData['name']) ? $applyData['name'] : '',
+            'webKeyword' => isset($applyData['name']) ? $applyData['name'] : '',
+            'webDescription' => isset($applyData['name']) ? $applyData['name'] : '',
+            'wxMenuInit' => 0,
+            'wxTMessageInit' => 0,
+            'payment' => 0,//支付功能关闭
+            'recharge' => 0,//充值功能关闭
+            'giveCoupon' => 1,//默认赠送代金劵
+            'giveCouponPrice' => 5,//代金劵金额5元
+            'couponMeetPrice' => 180,//满足金额
+            'couponValidity' => 30,//代金劵有效期30天
+            'alipayAccount' => isset($applyData['alipayAccount']) ? $applyData['alipayAccount'] : '',//提现的支付宝帐号
+            'alipayAccountName' => isset($applyData['alipayAccountName']) ? $applyData['alipayAccountName'] : '',//提现支付宝帐号姓名
+            'gradeList' => '1_2000_0.9I2_5000_0.88I3_10000_0.85I4_20000_0.8',//1 级会员需要满 2000 积分 购物享9折;2 级会员需要满 5000 积分 购物享88折
+        ];
+        MerchantExtendClass::add($extendData);
+
+        MerchantInitClass::add(['sjId' => $sjId]);
+
+        //创建门店
+        $shopData = [
+            'shopName' => '首店',
+            'sjId' => $sjId,
+            'merchantName' => $sjName,
+            'telephone' => $mobile,
+            'default' => 1,
+            'mainId' => $mainId,
+            'parentId' => $applyData['introSjId'] ?? 0,
+            'parentShopId' => $applyData['introShopId'] ?? 0,
+            'mobile' => $mobile,
+            'introduction' => '欢迎光临',
+            'province' => $applyData['province'] ?? '',
+            'city' => $applyData['city'] ?? '',
+            'dist' => $applyData['dist'] ?? '',
+            'address' => $applyData['address'] ?? '',
+            'floor' => $applyData['floor'] ?? '',
+            'fullAddress' => $applyData['fullAddress'] ?? '',
+            'open' => 1,
+            'lat' => $applyData['lat'] ?? '',
+            'long' => $applyData['long'] ?? '',
+            'img' => ['/example/shop/1.jpg'],
+            'ptStyle' => $ptStyle,
+        ];
+        $shopRespond = \bizGhs\shop\classes\ShopClass::addShop($shopData);
+        $shopId = $shopRespond->id;
+
+        //变更状态和设置商家的默认门店
+        $sjData = [];
+        $sjData['defaultShopId'] = $shopId;
+        $sjStatus = MerchantClass::STATUS_HAS_CHECK;
+        $sjData['status'] = $sjStatus;
+        MerchantClass::updateById($sjId, $sjData);
+
+        //建立供应商和客户关系
+        if ($applyThis) {
+            CustomService::shareBuildTrade($applyData, $shopRespond);
+        }
+
+        return ['sj' => $sj, 'shop' => $shopRespond];
+    }
+
     //商家在业务端的权限 ssh 2019.11.25
     public static function getAuthIdList($sjId, $endId)
     {

+ 45 - 0
biz-ghs/shop/classes/ShopClass.php

@@ -0,0 +1,45 @@
+<?php
+
+
+namespace bizGhs\shop\classes;
+
+use biz\shop\classes\ShopExtClass;
+use common\components\stringUtil;
+use common\components\util;
+use Yii;
+use bizHd\base\classes\BaseClass;
+
+class ShopClass extends BaseClass
+{
+
+    public static $baseFile = '\bizGhs\shop\models\Shop';
+
+    //创建门店 ssh 2020.2.8
+    public static function addShop($data)
+    {
+        $data['createTime'] = date("Y-m-d H:i:s");
+        $shopName = isset($data['shopName']) ? $data['shopName'] : '';
+        if (empty($shopName)) {
+            util::fail('请填写门店名称');
+        }
+        if (stringUtil::getWordNum($shopName) > 8) {
+            util::fail('门店名称不能超过8个汉字,2个字母顶一个汉字');
+        }
+        $exists = self::getByCondition(['sjId' => $data['sjId'], 'shopName' => $shopName]);
+        if (!empty($exists)) {
+            util::fail('门店名称已经存在');
+        }
+        //补充fullAddress lqh 2021.4.18
+        $data['fullAddress'] = $data['city'] . $data['address'] . $data['floor'];
+        $data['img'] = isset($data['img']) && !empty($data['img']) ? json_encode($data['img']) : '';
+        if (isset($data['ptStyle']) == false) {
+            util::fail('请先择平台类型');
+        }
+        $shop = self::add($data, true);
+        $newShopId = $shop->id;
+        $extData = ['shopId' => $newShopId];
+        ShopExtClass::add($extData);
+        return $shop;
+    }
+
+}

+ 15 - 0
biz-ghs/shop/models/Shop.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace bizGhs\shop\models;
+
+use bizHd\base\models\Base;
+
+class Shop extends Base
+{
+	
+	public static function tableName()
+	{
+		return 'xhShop';
+	}
+	
+}

+ 14 - 0
biz-ghs/shop/services/ShopService.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace bizGhs\shop\services;
+
+use bizHd\base\services\BaseService;
+use common\components\util;
+use Yii;
+
+class ShopService extends BaseService
+{
+
+    public static $baseFile = '\bizGhs\shop\classes\ShopClass';
+
+}

+ 1 - 25
biz-hd/merchant/classes/ShopClass.php

@@ -70,7 +70,7 @@ class ShopClass extends BaseClass
         $main = MainClass::add(['id' => null], true);
         $mainId = $main->id ?? 0;
         $data['mainId'] = $mainId;
-        $newShop = self::addShop($data);
+        $newShop = \bizHd\shop\classes\ShopClass::addShop($data);
 
         //从首店复制花材和分类
         \bizGhs\item\services\ItemService::copyItem($defaultMainId, $mainId);
@@ -79,33 +79,9 @@ class ShopClass extends BaseClass
         $initAdminData = ['mobile' => $mobile, 'adminId' => $adminId];
         \bizGhs\admin\classes\AdminClass::initAdmin($initAdminData, $mainId, $newShop);
 
-        //商品和分类初始化
-        CategoryClass::initCategoryGoods($mainId);
-        //商城和门店广告初始化
-        AdClass::initAdd($mainId);
-        //商品配置信息
-        $setData = ['mainId' => $mainId, 'riseType' => 0, 'riseAmount' => 0];
-        GoodsSettingClass::add($setData);
         return $newShop;
     }
 
-    //创建门店 ssh 2020.2.8
-    public static function addShop($data)
-    {
-        $data['createTime'] = date("Y-m-d H:i:s");
-        $shopName = isset($data['shopName']) ? $data['shopName'] : '';
-        if (empty($shopName)) {
-            util::fail('请填写门店名称');
-        }
-        $exists = self::getByCondition(['sjId' => $data['sjId'], 'shopName' => $shopName]);
-        if (!empty($exists)) {
-            util::fail('门店名称已经存在');
-        }
-        $data['img'] = isset($data['img']) ? json_encode($data['img']) : json_encode([]);
-        $shop = self::add($data);
-        return $shop;
-    }
-
     //取商家所有门店 ssh 2020.2.29
     public static function getAllShop($sjId)
     {

+ 29 - 0
biz-hd/merchant/classes/SjAssetClass.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace bizHd\merchant\classes;
+
+use biz\pt\classes\PtAssetClass;
+use biz\pt\models\PtAsset;
+use biz\shop\classes\MainClass;
+use biz\shop\classes\ShopYeChangeClass;
+use bizGhs\product\classes\ProductClass;
+use bizHd\ad\classes\AdClass;
+use bizHd\admin\classes\ShopAdminClass;
+use bizHd\goods\classes\CategoryClass;
+use bizHd\goods\classes\GoodsSettingClass;
+use common\components\dict;
+use common\components\dirUtil;
+use common\components\httpUtil;
+use common\components\qrCodeUtil;
+use common\components\stringUtil;
+use common\components\util;
+use common\components\wxUtil;
+use Yii;
+use bizHd\base\classes\BaseClass;
+
+class SjAssetClass extends BaseClass
+{
+
+    public static $baseFile = '\bizHd\merchant\models\SjAsset';
+
+}

+ 36 - 0
biz-hd/merchant/classes/SjClass.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace bizHd\merchant\classes;
+
+use biz\pt\classes\PtAssetClass;
+use biz\pt\models\PtAsset;
+use biz\shop\classes\MainClass;
+use biz\shop\classes\ShopYeChangeClass;
+use bizGhs\product\classes\ProductClass;
+use bizHd\ad\classes\AdClass;
+use bizHd\admin\classes\ShopAdminClass;
+use bizHd\goods\classes\CategoryClass;
+use bizHd\goods\classes\GoodsSettingClass;
+use common\components\dict;
+use common\components\dirUtil;
+use common\components\httpUtil;
+use common\components\qrCodeUtil;
+use common\components\stringUtil;
+use common\components\util;
+use common\components\wxUtil;
+use Yii;
+use bizHd\base\classes\BaseClass;
+
+class SjClass extends BaseClass
+{
+
+    //状态
+    const STATUS_UN_CHECK = 0;
+    const STATUS_HAS_CHECK = 1;
+    const STATUS_CHECK_NOT_PASS = 2;
+    const STATUS_FREEZE = 3;
+    const STATUS_EXPIRE = 4;
+
+    public static $baseFile = '\bizHd\merchant\models\Sj';
+
+}

+ 29 - 0
biz-hd/merchant/classes/SjExtendClass.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace bizHd\merchant\classes;
+
+use biz\pt\classes\PtAssetClass;
+use biz\pt\models\PtAsset;
+use biz\shop\classes\MainClass;
+use biz\shop\classes\ShopYeChangeClass;
+use bizGhs\product\classes\ProductClass;
+use bizHd\ad\classes\AdClass;
+use bizHd\admin\classes\ShopAdminClass;
+use bizHd\goods\classes\CategoryClass;
+use bizHd\goods\classes\GoodsSettingClass;
+use common\components\dict;
+use common\components\dirUtil;
+use common\components\httpUtil;
+use common\components\qrCodeUtil;
+use common\components\stringUtil;
+use common\components\util;
+use common\components\wxUtil;
+use Yii;
+use bizHd\base\classes\BaseClass;
+
+class SjExtendClass extends BaseClass
+{
+
+    public static $baseFile = '\bizHd\merchant\models\SjExtend';
+
+}

+ 29 - 0
biz-hd/merchant/classes/SjInitClass.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace bizHd\merchant\classes;
+
+use biz\pt\classes\PtAssetClass;
+use biz\pt\models\PtAsset;
+use biz\shop\classes\MainClass;
+use biz\shop\classes\ShopYeChangeClass;
+use bizGhs\product\classes\ProductClass;
+use bizHd\ad\classes\AdClass;
+use bizHd\admin\classes\ShopAdminClass;
+use bizHd\goods\classes\CategoryClass;
+use bizHd\goods\classes\GoodsSettingClass;
+use common\components\dict;
+use common\components\dirUtil;
+use common\components\httpUtil;
+use common\components\qrCodeUtil;
+use common\components\stringUtil;
+use common\components\util;
+use common\components\wxUtil;
+use Yii;
+use bizHd\base\classes\BaseClass;
+
+class SjInitClass extends BaseClass
+{
+
+    public static $baseFile = '\bizHd\merchant\models\SjInit';
+
+}

+ 13 - 0
biz-hd/merchant/models/Sj.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizHd\merchant\models;
+use bizHd\base\models\Base;
+
+class Sj extends Base
+{
+
+	public static function tableName()
+	{
+		return 'xhSj';
+	}
+
+}

+ 13 - 0
biz-hd/merchant/models/SjAsset.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizHd\merchant\models;
+use bizHd\base\models\Base;
+
+class SjAsset extends Base
+{
+
+	public static function tableName()
+	{
+		return 'xhSjAsset';
+	}
+
+}

+ 13 - 0
biz-hd/merchant/models/SjExtend.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizHd\merchant\models;
+use bizHd\base\models\Base;
+
+class SjExtend extends Base
+{
+
+	public static function tableName()
+	{
+		return 'xhSjExtend';
+	}
+
+}

+ 13 - 0
biz-hd/merchant/models/SjInit.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizHd\merchant\models;
+use bizHd\base\models\Base;
+
+class SjInit extends Base
+{
+
+	public static function tableName()
+	{
+		return 'xhSjInit';
+	}
+
+}

+ 18 - 0
biz-hd/merchant/services/SjAssetService.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace bizHd\merchant\services;
+
+use bizHd\base\services\BaseService;
+use bizHd\merchant\classes\ShopClass;
+use bizHd\saas\classes\ApplyClass;
+use common\components\dict;
+use common\components\stringUtil;
+use common\components\util;
+use Yii;
+
+class SjAssetService extends BaseService
+{
+
+    public static $baseFile = '\bizHd\merchant\classes\SjAssetClass';
+
+}

+ 144 - 0
biz-hd/merchant/services/SjService.php

@@ -0,0 +1,144 @@
+<?php
+
+namespace bizHd\merchant\services;
+
+use bizGhs\custom\services\CustomService;
+use bizHd\base\services\BaseService;
+use bizHd\merchant\classes\SjAssetClass;
+use bizHd\merchant\classes\SjClass;
+use bizHd\merchant\classes\SjExtendClass;
+use bizHd\merchant\classes\SjInitClass;
+use bizHd\saas\classes\ApplyClass;
+use bizHd\shop\classes\ShopClass;
+use common\components\dict;
+use common\components\stringUtil;
+use Yii;
+
+class SjService extends BaseService
+{
+
+    public static $baseFile = '\bizHd\merchant\classes\SjClass';
+
+
+    public static function initHdBaseInfo($applyData, $main, $applyThis = false)
+    {
+        $applyId = $applyData['id'] ?? 0;
+        $mainId = $main->id ?? 0;
+        unset($applyData['id']);
+        $ptStyle = dict::getDict('ptStyle', 'hd');
+        //生成商家
+        $applyData['accountStyle'] = 0;
+        $applyData['status'] = 1;
+        $applyData['lat'] = $applyData['lat'] ?? (string)0;
+        $applyData['long'] = $applyData['long'] ?? (string)0;
+        $applyData['precision'] = (string)0;
+        $applyData['wxToken'] = stringUtil::buildWxToken(0);
+        $applyData['photoList'] = $applyData['photoList'] ?? '';
+        $applyData['name'] = $applyData['name'] ?? '';
+        $applyData['province'] = $applyData['province'] ?? '';
+        $applyData['city'] = $applyData['city'] ?? '';
+        $applyData['dist'] = $applyData['dist'] ?? '';
+        $applyData['address'] = $applyData['address'] ?? '';
+        $applyData['agentLevel'] = 1;
+        $applyData['parentId'] = $applyData['introSjId'] ?? 0;
+        $deadline = time() + 365 * 86400;
+        $applyData['deadline'] = date("Y-m-d H:i:s", $deadline);
+        $applyData['parentId'] = $applyData['introSjId'] ?? 0;
+        $applyData['parentShopId'] = $applyData['introShopId'] ?? 0;
+
+        $jsData = $applyData;
+        $sjData['style'] = dict::getDict('ptStyle', 'hd');
+        $sj = self::add($jsData, true);
+        $sjId = $sj->id;
+        $sjName = $sj->name ?? 0;
+        $mobile = $applyData['mobile'] ?? '';
+
+        if (!empty($applyId) && $applyThis == true) {
+            ApplyClass::updateById($applyId, ['sjId' => $sjId]);
+        }
+
+        //生成资产
+        $assetData = [
+            'balance' => 0,
+            'totalVisit' => 0,
+            'totalUser' => 0,
+            'totalMember' => 0,
+            'totalFans' => 0,
+            'totalIntegral' => 0,
+            'totalPoint' => 0,
+            'totalGoods' => 0,
+            'totalRecharge' => 0,
+            'totalOrder' => 0,
+            'totalDeal' => 0,
+            'sjId' => $sjId,
+            'totalIncome' => 0,
+            'totalExpend' => 0,
+        ];
+        SjAssetClass::add($assetData);
+
+        //生成商家拓展信息
+        $extendData = [
+            'sjId' => $sjId,
+            'wxAppId' => isset($applyData['wxAppId']) ? $applyData['wxAppId'] : '',
+            'webTitle' => isset($applyData['name']) ? $applyData['name'] : '',
+            'webKeyword' => isset($applyData['name']) ? $applyData['name'] : '',
+            'webDescription' => isset($applyData['name']) ? $applyData['name'] : '',
+            'wxMenuInit' => 0,
+            'wxTMessageInit' => 0,
+            'payment' => 0,//支付功能关闭
+            'recharge' => 0,//充值功能关闭
+            'giveCoupon' => 1,//默认赠送代金劵
+            'giveCouponPrice' => 5,//代金劵金额5元
+            'couponMeetPrice' => 180,//满足金额
+            'couponValidity' => 30,//代金劵有效期30天
+            'alipayAccount' => isset($applyData['alipayAccount']) ? $applyData['alipayAccount'] : '',//提现的支付宝帐号
+            'alipayAccountName' => isset($applyData['alipayAccountName']) ? $applyData['alipayAccountName'] : '',//提现支付宝帐号姓名
+            'gradeList' => '1_2000_0.9I2_5000_0.88I3_10000_0.85I4_20000_0.8',//1 级会员需要满 2000 积分 购物享9折;2 级会员需要满 5000 积分 购物享88折
+        ];
+        SjExtendClass::add($extendData);
+
+        SjInitClass::add(['sjId' => $sjId]);
+
+        //创建门店
+        $shopData = [
+            'shopName' => '首店',
+            'sjId' => $sjId,
+            'merchantName' => $sjName,
+            'telephone' => $mobile,
+            'default' => 1,
+            'mainId' => $mainId,
+            'parentId' => $applyData['introSjId'] ?? 0,
+            'parentShopId' => $applyData['introShopId'] ?? 0,
+            'mobile' => $mobile,
+            'introduction' => '欢迎光临',
+            'province' => $applyData['province'] ?? '',
+            'city' => $applyData['city'] ?? '',
+            'dist' => $applyData['dist'] ?? '',
+            'address' => $applyData['address'] ?? '',
+            'floor' => $applyData['floor'] ?? '',
+            'fullAddress' => $applyData['fullAddress'] ?? '',
+            'open' => 1,
+            'lat' => $applyData['lat'] ?? '',
+            'long' => $applyData['long'] ?? '',
+            'img' => ['/example/shop/1.jpg'],
+            'ptStyle' => $ptStyle,
+        ];
+        $shopRespond = ShopClass::addShop($shopData);
+        $shopId = $shopRespond->id;
+
+        //变更状态和设置商家的默认门店
+        $sjData = [];
+        $sjData['defaultShopId'] = $shopId;
+        $sjStatus = SjClass::STATUS_HAS_CHECK;
+        $sjData['status'] = $sjStatus;
+        SjClass::updateById($sjId, $sjData);
+
+        //建立供应商和客户关系
+        if ($applyThis) {
+            CustomService::shareBuildTrade($applyData, $shopRespond);
+        }
+
+        return ['sj' => $sj, 'shop' => $shopRespond];
+    }
+
+}

+ 6 - 42
biz-hd/saas/services/ApplyService.php

@@ -78,53 +78,17 @@ class ApplyService extends BaseService
         $apply['name'] = isset($apply['name']) ? $apply['name'] : '';
         $main = MainClass::add(['id' => null], true);
         $mainId = $main->id ?? 0;
-        $respond = [];
-        $style = $apply['style'] ?? dict::getDict('ptStyle', 'hd');
-        if ($style == dict::getDict('ptStyle', 'hd')) {
-            $respond = MerchantService::initHdBaseInfo($apply, $main, true);
-            $shop = $respond['shop'] ?? [];
 
-            //商品和分类初始化
-            CategoryClass::initCategoryGoods($mainId);
-            //商城和门店广告初始化
-            AdClass::initAdd($mainId);
-            //初始化员工和角色
-            \bizGhs\admin\classes\AdminClass::initAdmin($apply, $mainId, $shop);
-            //初始化花材
-            \bizGhs\item\services\ItemService::initItem($mainId);
-            //商家商品配置信息
-            $setData = ['mainId' => $mainId, 'riseType' => 0, 'riseAmount' => 0];
-            GoodsSettingClass::add($setData);
+        $respond = MerchantService::initHdBaseInfo($apply, $main, true);
+        $shop = $respond['shop'] ?? [];
 
-        } elseif ($style == dict::getDict('ptStyle', 'ghs')) {
-            $respond = MerchantService::initGhsBaseInfo($apply, $main, true);
-            $shop = $respond['shop'] ?? [];
-            $ret = MerchantService::initHdBaseInfo($apply, $main);
-            $shop2 = $ret['shop'] ?? [];
 
-            $shop2->pfShopId = $shop->id ?? 0;
-            $shop2->save();
+        //初始化员工和角色
+        \bizGhs\admin\classes\AdminClass::initAdmin($apply, $mainId, $shop);
+        //初始化花材
+        \bizGhs\item\services\ItemService::initItem($mainId);
 
-            $shop->lsShopId = $shop2->id ?? 0;
-            $shop->save();
 
-            //商品和分类初始化
-            CategoryClass::initCategoryGoods($mainId);
-            //商城和门店广告初始化
-            AdClass::initAdd($mainId);
-            //初始化员工和角色
-            \bizGhs\admin\classes\AdminClass::initAdmin($apply, $mainId, $shop, $shop2);
-            //初始化花材
-            \bizGhs\item\services\ItemService::initItem($mainId);
-            //商家商品配置信息
-            $setData = ['mainId' => $mainId, 'riseType' => 0, 'riseAmount' => 0];
-            GoodsSettingClass::add($setData);
-
-        } elseif ($style == dict::getDict('ptStyle', 'kmGhs')) {
-            $respond = MerchantService::initJdGhsBaseInfo($apply, $main, true);
-        } else {
-            util::fail('无效申请');
-        }
         return $respond;
     }
 

+ 56 - 0
biz-hd/shop/classes/ShopClass.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace bizHd\shop\classes;
+
+use biz\shop\classes\ShopExtClass;
+use bizHd\ad\classes\AdClass;
+use bizHd\goods\classes\CategoryClass;
+use bizHd\goods\classes\GoodsSettingClass;
+use common\components\stringUtil;
+use Yii;
+use bizHd\base\classes\BaseClass;
+
+class ShopClass extends BaseClass
+{
+
+    public static $baseFile = '\bizHd\shop\models\Shop';
+
+    //创建门店 ssh 2020.2.8
+    public static function addShop($data)
+    {
+        $data['createTime'] = date("Y-m-d H:i:s");
+        $shopName = isset($data['shopName']) ? $data['shopName'] : '';
+        $mainId = $data['mainId'] ?? 0;
+        if (empty($shopName)) {
+            util::fail('请填写门店名称');
+        }
+        if (stringUtil::getWordNum($shopName) > 8) {
+            util::fail('门店名称不能超过8个汉字,2个字母顶一个汉字');
+        }
+        $exists = self::getByCondition(['sjId' => $data['sjId'], 'shopName' => $shopName]);
+        if (!empty($exists)) {
+            util::fail('门店名称已经存在');
+        }
+        //补充fullAddress lqh 2021.4.18
+        $data['fullAddress'] = $data['city'] . $data['address'] . $data['floor'];
+        $data['img'] = isset($data['img']) && !empty($data['img']) ? json_encode($data['img']) : '';
+        if (isset($data['ptStyle']) == false) {
+            util::fail('请先择平台类型');
+        }
+        $shop = self::add($data, true);
+        $newShopId = $shop->id;
+        $extData = ['shopId' => $newShopId];
+        ShopExtClass::add($extData);
+
+        //商品和分类初始化
+        CategoryClass::initCategoryGoods($mainId);
+        //商城和门店广告初始化
+        AdClass::initAdd($mainId);
+        //商品配置信息
+        $setData = ['mainId' => $mainId, 'riseType' => 0, 'riseAmount' => 0];
+        GoodsSettingClass::add($setData);
+
+        return $shop;
+    }
+
+}

+ 13 - 0
biz-hd/shop/models/Shop.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizHd\shop\models;
+use bizHd\base\models\Base;
+
+class Shop extends Base
+{
+
+    public static function tableName()
+    {
+        return 'xhShop';
+    }
+
+}

+ 13 - 0
biz-hd/shop/services/ShopService.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace bizHd\stat\services;
+
+use bizHd\base\services\BaseService;
+use Yii;
+
+class ShopService extends BaseService
+{
+
+    public static $baseFile = '\bizHd\shop\classes\ShopClass';
+
+}

+ 11 - 0
biz-jd/apply/classes/ApplyClass.php

@@ -0,0 +1,11 @@
+<?php
+
+namespace bizJd\apply\classes;
+
+use bizJd\base\classes\BaseClass;
+
+class ApplyClass extends BaseClass
+{
+
+    public static $baseFile = '\bizJd\apply\models\Apply';
+}

+ 13 - 0
biz-jd/apply/models/Apply.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizJd\apply\models;
+use bizJd\base\models\Base;
+
+class Apply extends Base
+{
+
+    public static function tableName()
+    {
+        return 'xhApply';
+    }
+
+}

+ 31 - 0
biz-jd/apply/services/ApplyService.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace bizJd\apply\services;
+
+use biz\shop\classes\MainClass;
+use bizJd\apply\classes\ApplyClass;
+use bizJd\base\services\BaseService;
+use bizJd\sj\services\SjService;
+use Yii;
+
+class ApplyService extends BaseService
+{
+
+    public static $baseFile = '\bizJd\apply\classes\ApplyClass';
+
+    //审核通过,商家初始化 ssh 2021.2.23
+    public static function pass($id, $remark = '')
+    {
+        $apply = ApplyClass::getById($id);
+        if (empty($apply)) {
+            util::fail('没有找到申请记录');
+        }
+        $applyId = $apply['id'];
+        ApplyClass::updateById($applyId, ['status' => ApplyClass::STATUS_PASS, 'remark' => $remark]);
+        $apply['name'] = isset($apply['name']) ? $apply['name'] : '';
+        $main = MainClass::add(['id' => null], true);
+        $respond = SjService::initJdGhsBaseInfo($apply, $main, true);
+        return $respond;
+    }
+
+}

+ 9 - 0
biz-jd/base/classes/BaseClass.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace bizJd\base\classes;
+use Yii;
+
+class BaseClass extends \common\base\classes\BaseClass
+{
+
+}

+ 8 - 0
biz-jd/base/models/Base.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace bizJd\base\models;
+
+class Base extends \common\base\models\Base
+{
+
+}

+ 8 - 0
biz-jd/base/services/BaseService.php

@@ -0,0 +1,8 @@
+<?php
+
+namespace bizJd\base\services;
+
+class BaseService extends 	\common\base\services\BaseService
+{
+
+}

+ 42 - 0
biz-jd/shop/classes/ShopClass.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace bizJd\shop\classes;
+
+use biz\shop\classes\ShopExtClass;
+use bizJd\base\classes\BaseClass;
+use common\components\stringUtil;
+
+class ShopClass extends BaseClass
+{
+
+    public static $baseFile = '\bizJd\shop\models\Shop';
+
+    //创建门店 ssh 2020.2.8
+    public static function addShop($data)
+    {
+        $data['createTime'] = date("Y-m-d H:i:s");
+        $shopName = isset($data['shopName']) ? $data['shopName'] : '';
+        if (empty($shopName)) {
+            util::fail('请填写门店名称');
+        }
+        if (stringUtil::getWordNum($shopName) > 8) {
+            util::fail('门店名称不能超过8个汉字,2个字母顶一个汉字');
+        }
+        $exists = self::getByCondition(['sjId' => $data['sjId'], 'shopName' => $shopName]);
+        if (!empty($exists)) {
+            util::fail('门店名称已经存在');
+        }
+        //补充fullAddress lqh 2021.4.18
+        $data['fullAddress'] = $data['city'] . $data['address'] . $data['floor'];
+        $data['img'] = isset($data['img']) && !empty($data['img']) ? json_encode($data['img']) : '';
+        if (isset($data['ptStyle']) == false) {
+            util::fail('请先择平台类型');
+        }
+        $shop = self::add($data, true);
+        $newShopId = $shop->id;
+        $extData = ['shopId' => $newShopId];
+        ShopExtClass::add($extData);
+        return $shop;
+    }
+
+}

+ 13 - 0
biz-jd/shop/models/Shop.php

@@ -0,0 +1,13 @@
+<?php
+namespace bizJd\shop\models;
+use bizJd\base\models\Base;
+
+class Shop extends Base
+{
+
+    public static function tableName()
+    {
+        return 'xhShop';
+    }
+
+}

+ 13 - 0
biz-jd/shop/services/ShopService.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace bizJd\shop\services;
+
+use bizJd\base\services\BaseService;
+use Yii;
+
+class ShopService extends BaseService
+{
+
+    public static $baseFile = '\bizJd\shop\classes\ShopClass';
+
+}

+ 12 - 0
biz-jd/sj/classes/SjClass.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace bizJd\sj\classes;
+
+use bizJd\base\classes\BaseClass;
+
+class SjClass extends BaseClass
+{
+
+    public static $baseFile = '\bizJd\sj\models\Sj';
+
+}

+ 15 - 0
biz-jd/sj/models/Sj.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace bizJd\sj\models;
+
+use bizJd\base\models\Base;
+
+class Sj extends Base
+{
+
+    public static function tableName()
+    {
+        return 'xhSj';
+    }
+
+}

+ 144 - 0
biz-jd/sj/services/SjService.php

@@ -0,0 +1,144 @@
+<?php
+
+namespace bizJd\sj\services;
+
+use biz\sj\classes\MerchantAssetClass;
+use biz\sj\classes\MerchantClass;
+use biz\sj\classes\MerchantExtendClass;
+use biz\sj\classes\MerchantInitClass;
+use bizGhs\custom\services\CustomService;
+use bizJd\apply\classes\ApplyClass;
+use bizJd\base\services\BaseService;
+use bizJd\shop\classes\ShopClass;
+use common\components\dict;
+use common\components\stringUtil;
+use Yii;
+
+class SjService extends BaseService
+{
+
+    public static $baseFile = '\bizJd\sj\classes\SjClass';
+
+    public static function initJdGhsBaseInfo($applyData, $main, $applyThis = false)
+    {
+        $applyId = $applyData['id'] ?? 0;
+        $mainId = $main->id ?? 0;
+        unset($applyData['id']);
+
+        //生成商家
+        $applyData['accountStyle'] = 0;
+        $applyData['status'] = 1;
+        $applyData['lat'] = $applyData['lat'] ?? (string)0;
+        $applyData['long'] = $applyData['long'] ?? (string)0;
+        $applyData['precision'] = (string)0;
+        $applyData['wxToken'] = stringUtil::buildWxToken(0);
+        $applyData['photoList'] = $applyData['photoList'] ?? '';
+        $applyData['name'] = $applyData['name'] ?? '';
+        $applyData['province'] = $applyData['province'] ?? '';
+        $applyData['city'] = $applyData['city'] ?? '';
+        $applyData['dist'] = $applyData['dist'] ?? '';
+        $applyData['address'] = $applyData['address'] ?? '';
+        $applyData['agentLevel'] = 1;
+        $applyData['parentId'] = $applyData['introSjId'] ?? 0;
+        $deadline = time() + 365 * 86400;
+        $applyData['deadline'] = date("Y-m-d H:i:s", $deadline);
+        $applyData['parentId'] = $applyData['introSjId'] ?? 0;
+        $applyData['parentShopId'] = $applyData['introShopId'] ?? 0;
+
+        $sjData = $applyData;
+        $sjData['style'] = dict::getDict('ptStyle', 'kmGhs');
+        $sj = self::add($sjData, true);
+        $sjId = $sj->id;
+        $sjName = $sj->name ?? 0;
+        $mobile = $applyData['mobile'] ?? '';
+        $ptStyle = $applyData['style'] ?? dict::getDict('ptStyle', 'hd');
+
+        if (!empty($applyId) && $applyThis) {
+            ApplyClass::updateById($applyId, ['sjId' => $sjId]);
+        }
+
+        //生成资产
+        $assetData = [
+            'balance' => 0,
+            'totalVisit' => 0,
+            'totalUser' => 0,
+            'totalMember' => 0,
+            'totalFans' => 0,
+            'totalIntegral' => 0,
+            'totalPoint' => 0,
+            'totalGoods' => 0,
+            'totalRecharge' => 0,
+            'totalOrder' => 0,
+            'totalDeal' => 0,
+            'sjId' => $sjId,
+            'totalIncome' => 0,
+            'totalExpend' => 0,
+        ];
+        MerchantAssetClass::add($assetData);
+
+        //生成商家拓展信息
+        $extendData = [
+            'sjId' => $sjId,
+            'wxAppId' => isset($applyData['wxAppId']) ? $applyData['wxAppId'] : '',
+            'webTitle' => isset($applyData['name']) ? $applyData['name'] : '',
+            'webKeyword' => isset($applyData['name']) ? $applyData['name'] : '',
+            'webDescription' => isset($applyData['name']) ? $applyData['name'] : '',
+            'wxMenuInit' => 0,
+            'wxTMessageInit' => 0,
+            'payment' => 0,//支付功能关闭
+            'recharge' => 0,//充值功能关闭
+            'giveCoupon' => 1,//默认赠送代金劵
+            'giveCouponPrice' => 5,//代金劵金额5元
+            'couponMeetPrice' => 180,//满足金额
+            'couponValidity' => 30,//代金劵有效期30天
+            'alipayAccount' => isset($applyData['alipayAccount']) ? $applyData['alipayAccount'] : '',//提现的支付宝帐号
+            'alipayAccountName' => isset($applyData['alipayAccountName']) ? $applyData['alipayAccountName'] : '',//提现支付宝帐号姓名
+            'gradeList' => '1_2000_0.9I2_5000_0.88I3_10000_0.85I4_20000_0.8',//1 级会员需要满 2000 积分 购物享9折;2 级会员需要满 5000 积分 购物享88折
+        ];
+        MerchantExtendClass::add($extendData);
+        MerchantInitClass::add(['sjId' => $sjId]);
+
+        //创建门店
+        $shopData = [
+            'shopName' => '首店',
+            'sjId' => $sjId,
+            'merchantName' => $sjName,
+            'telephone' => $mobile,
+            'default' => 1,
+            'mainId' => $mainId,
+            'parentId' => $applyData['introSjId'] ?? 0,
+            'parentShopId' => $applyData['introShopId'] ?? 0,
+            'mobile' => $mobile,
+            'introduction' => '欢迎光临',
+            'province' => $applyData['province'] ?? '',
+            'city' => $applyData['city'] ?? '',
+            'dist' => $applyData['dist'] ?? '',
+            'address' => $applyData['address'] ?? '',
+            'floor' => $applyData['floor'] ?? '',
+            'fullAddress' => $applyData['fullAddress'] ?? '',
+            'open' => 1,
+            'lat' => $applyData['lat'] ?? '',
+            'long' => $applyData['long'] ?? '',
+            'img' => ['/example/shop/1.jpg'],
+            'ptStyle' => $ptStyle,
+        ];
+
+        $shopRespond = ShopClass::addShop($shopData);
+        $shopId = $shopRespond->id;
+
+        //变更状态和设置商家的默认门店
+        $sjData = [];
+        $sjData['defaultShopId'] = $shopId;
+        $sjStatus = MerchantClass::STATUS_HAS_CHECK;
+        $sjData['status'] = $sjStatus;
+        MerchantClass::updateById($sjId, $sjData);
+
+        //建立供应商和客户关系
+        if ($applyThis) {
+            CustomService::shareBuildTrade($applyData, $shopRespond);
+        }
+
+        return ['sj' => $sj, 'shop' => $shopRespond];
+    }
+
+}

+ 0 - 28
biz/shop/classes/ShopClass.php

@@ -69,34 +69,6 @@ class ShopClass extends BaseClass
         return isset($merchant['defaultShopId']) ? $merchant['defaultShopId'] : 0;
     }
 
-    //创建门店 ssh 2020.2.8
-    public static function addShop($data)
-    {
-        $data['createTime'] = date("Y-m-d H:i:s");
-        $shopName = isset($data['shopName']) ? $data['shopName'] : '';
-        if (empty($shopName)) {
-            util::fail('请填写门店名称');
-        }
-        if (stringUtil::getWordNum($shopName) > 8) {
-            util::fail('门店名称不能超过8个汉字,2个字母顶一个汉字');
-        }
-        $exists = self::getByCondition(['sjId' => $data['sjId'], 'shopName' => $shopName]);
-        if (!empty($exists)) {
-            util::fail('门店名称已经存在');
-        }
-        //补充fullAddress lqh 2021.4.18
-        $data['fullAddress'] = $data['city'] . $data['address'] . $data['floor'];
-        $data['img'] = isset($data['img']) && !empty($data['img']) ? json_encode($data['img']) : '';
-        if (isset($data['ptStyle']) == false) {
-            util::fail('请先择平台类型');
-        }
-        $shop = self::add($data, true);
-        $newShopId = $shop->id;
-        $extData = ['shopId' => $newShopId];
-        ShopExtClass::add($extData);
-        return $shop;
-    }
-
     //更新门店 ssh 2020.2.29
     public static function updateShop($shop, $data)
     {

+ 1 - 367
biz/sj/services/MerchantService.php

@@ -17,6 +17,7 @@ use bizHd\saas\services\SetAuthService;
 use bizHd\user\services\UserService;
 use bizHd\wx\services\WxMenuService;
 use biz\sj\classes\MerchantInitClass;
+use bizJd\shop\classes\ShopClass;
 use common\components\business;
 use common\components\dict;
 use common\components\stringUtil;
@@ -50,373 +51,6 @@ class MerchantService extends BaseService
         CustomClass::updateByCondition(['sjId' => $sjId], ['isOpen' => 1]);
     }
 
-    public static function initJdGhsBaseInfo($applyData, $main, $applyThis = false)
-    {
-        $applyId = $applyData['id'] ?? 0;
-        $mainId = $main->id ?? 0;
-        unset($applyData['id']);
-
-        //生成商家
-        $applyData['accountStyle'] = 0;
-        $applyData['status'] = 1;
-        $applyData['lat'] = $applyData['lat'] ?? (string)0;
-        $applyData['long'] = $applyData['long'] ?? (string)0;
-        $applyData['precision'] = (string)0;
-        $applyData['wxToken'] = stringUtil::buildWxToken(0);
-        $applyData['photoList'] = $applyData['photoList'] ?? '';
-        $applyData['name'] = $applyData['name'] ?? '';
-        $applyData['province'] = $applyData['province'] ?? '';
-        $applyData['city'] = $applyData['city'] ?? '';
-        $applyData['dist'] = $applyData['dist'] ?? '';
-        $applyData['address'] = $applyData['address'] ?? '';
-        $applyData['agentLevel'] = 1;
-        $applyData['parentId'] = $applyData['introSjId'] ?? 0;
-        $deadline = time() + 365 * 86400;
-        $applyData['deadline'] = date("Y-m-d H:i:s", $deadline);
-        $applyData['parentId'] = $applyData['introSjId'] ?? 0;
-        $applyData['parentShopId'] = $applyData['introShopId'] ?? 0;
-
-        $sjData = $applyData;
-        $sjData['style'] = dict::getDict('ptStyle', 'kmGhs');
-        $sj = self::add($sjData, true);
-        $sjId = $sj->id;
-        $sjName = $sj->name ?? 0;
-        $mobile = $applyData['mobile'] ?? '';
-        $ptStyle = $applyData['style'] ?? dict::getDict('ptStyle', 'hd');
-
-        if (!empty($applyId) && $applyThis) {
-            ApplyClass::updateById($applyId, ['sjId' => $sjId]);
-        }
-
-        //生成资产
-        $assetData = [
-            'balance' => 0,
-            'totalVisit' => 0,
-            'totalUser' => 0,
-            'totalMember' => 0,
-            'totalFans' => 0,
-            'totalIntegral' => 0,
-            'totalPoint' => 0,
-            'totalGoods' => 0,
-            'totalRecharge' => 0,
-            'totalOrder' => 0,
-            'totalDeal' => 0,
-            'sjId' => $sjId,
-            'totalIncome' => 0,
-            'totalExpend' => 0,
-        ];
-        MerchantAssetClass::add($assetData);
-
-        //生成商家拓展信息
-        $extendData = [
-            'sjId' => $sjId,
-            'wxAppId' => isset($applyData['wxAppId']) ? $applyData['wxAppId'] : '',
-            'webTitle' => isset($applyData['name']) ? $applyData['name'] : '',
-            'webKeyword' => isset($applyData['name']) ? $applyData['name'] : '',
-            'webDescription' => isset($applyData['name']) ? $applyData['name'] : '',
-            'wxMenuInit' => 0,
-            'wxTMessageInit' => 0,
-            'payment' => 0,//支付功能关闭
-            'recharge' => 0,//充值功能关闭
-            'giveCoupon' => 1,//默认赠送代金劵
-            'giveCouponPrice' => 5,//代金劵金额5元
-            'couponMeetPrice' => 180,//满足金额
-            'couponValidity' => 30,//代金劵有效期30天
-            'alipayAccount' => isset($applyData['alipayAccount']) ? $applyData['alipayAccount'] : '',//提现的支付宝帐号
-            'alipayAccountName' => isset($applyData['alipayAccountName']) ? $applyData['alipayAccountName'] : '',//提现支付宝帐号姓名
-            'gradeList' => '1_2000_0.9I2_5000_0.88I3_10000_0.85I4_20000_0.8',//1 级会员需要满 2000 积分 购物享9折;2 级会员需要满 5000 积分 购物享88折
-        ];
-        MerchantExtendClass::add($extendData);
-
-        MerchantInitClass::add(['sjId' => $sjId]);
-
-        //创建门店
-        $shopData = [
-            'shopName' => '首店',
-            'sjId' => $sjId,
-            'merchantName' => $sjName,
-            'telephone' => $mobile,
-            'default' => 1,
-            'mainId' => $mainId,
-            'parentId' => $applyData['introSjId'] ?? 0,
-            'parentShopId' => $applyData['introShopId'] ?? 0,
-            'mobile' => $mobile,
-            'introduction' => '欢迎光临',
-            'province' => $applyData['province'] ?? '',
-            'city' => $applyData['city'] ?? '',
-            'dist' => $applyData['dist'] ?? '',
-            'address' => $applyData['address'] ?? '',
-            'floor' => $applyData['floor'] ?? '',
-            'fullAddress' => $applyData['fullAddress'] ?? '',
-            'open' => 1,
-            'lat' => $applyData['lat'] ?? '',
-            'long' => $applyData['long'] ?? '',
-            'img' => ['/example/shop/1.jpg'],
-            'ptStyle' => $ptStyle,
-        ];
-        $shopRespond = \biz\shop\classes\ShopClass::addShop($shopData);
-        $shopId = $shopRespond->id;
-
-        //变更状态和设置商家的默认门店
-        $sjData = [];
-        $sjData['defaultShopId'] = $shopId;
-        $sjStatus = MerchantClass::STATUS_HAS_CHECK;
-        $sjData['status'] = $sjStatus;
-        MerchantClass::updateById($sjId, $sjData);
-
-        //建立供应商和客户关系
-        if ($applyThis) {
-            CustomService::shareBuildTrade($applyData, $shopRespond);
-        }
-
-        return ['sj' => $sj, 'shop' => $shopRespond];
-    }
-
-    public static function initHdBaseInfo($applyData, $main, $applyThis = false)
-    {
-        $applyId = $applyData['id'] ?? 0;
-        $mainId = $main->id ?? 0;
-        unset($applyData['id']);
-        $ptStyle = dict::getDict('ptStyle', 'hd');
-        //生成商家
-        $applyData['accountStyle'] = 0;
-        $applyData['status'] = 1;
-        $applyData['lat'] = $applyData['lat'] ?? (string)0;
-        $applyData['long'] = $applyData['long'] ?? (string)0;
-        $applyData['precision'] = (string)0;
-        $applyData['wxToken'] = stringUtil::buildWxToken(0);
-        $applyData['photoList'] = $applyData['photoList'] ?? '';
-        $applyData['name'] = $applyData['name'] ?? '';
-        $applyData['province'] = $applyData['province'] ?? '';
-        $applyData['city'] = $applyData['city'] ?? '';
-        $applyData['dist'] = $applyData['dist'] ?? '';
-        $applyData['address'] = $applyData['address'] ?? '';
-        $applyData['agentLevel'] = 1;
-        $applyData['parentId'] = $applyData['introSjId'] ?? 0;
-        $deadline = time() + 365 * 86400;
-        $applyData['deadline'] = date("Y-m-d H:i:s", $deadline);
-        $applyData['parentId'] = $applyData['introSjId'] ?? 0;
-        $applyData['parentShopId'] = $applyData['introShopId'] ?? 0;
-
-        $jsData = $applyData;
-        $sjData['style'] = dict::getDict('ptStyle', 'hd');
-        $sj = self::add($jsData, true);
-        $sjId = $sj->id;
-        $sjName = $sj->name ?? 0;
-        $mobile = $applyData['mobile'] ?? '';
-
-        if (!empty($applyId) && $applyThis == true) {
-            ApplyClass::updateById($applyId, ['sjId' => $sjId]);
-        }
-
-        //生成资产
-        $assetData = [
-            'balance' => 0,
-            'totalVisit' => 0,
-            'totalUser' => 0,
-            'totalMember' => 0,
-            'totalFans' => 0,
-            'totalIntegral' => 0,
-            'totalPoint' => 0,
-            'totalGoods' => 0,
-            'totalRecharge' => 0,
-            'totalOrder' => 0,
-            'totalDeal' => 0,
-            'sjId' => $sjId,
-            'totalIncome' => 0,
-            'totalExpend' => 0,
-        ];
-        MerchantAssetClass::add($assetData);
-
-        //生成商家拓展信息
-        $extendData = [
-            'sjId' => $sjId,
-            'wxAppId' => isset($applyData['wxAppId']) ? $applyData['wxAppId'] : '',
-            'webTitle' => isset($applyData['name']) ? $applyData['name'] : '',
-            'webKeyword' => isset($applyData['name']) ? $applyData['name'] : '',
-            'webDescription' => isset($applyData['name']) ? $applyData['name'] : '',
-            'wxMenuInit' => 0,
-            'wxTMessageInit' => 0,
-            'payment' => 0,//支付功能关闭
-            'recharge' => 0,//充值功能关闭
-            'giveCoupon' => 1,//默认赠送代金劵
-            'giveCouponPrice' => 5,//代金劵金额5元
-            'couponMeetPrice' => 180,//满足金额
-            'couponValidity' => 30,//代金劵有效期30天
-            'alipayAccount' => isset($applyData['alipayAccount']) ? $applyData['alipayAccount'] : '',//提现的支付宝帐号
-            'alipayAccountName' => isset($applyData['alipayAccountName']) ? $applyData['alipayAccountName'] : '',//提现支付宝帐号姓名
-            'gradeList' => '1_2000_0.9I2_5000_0.88I3_10000_0.85I4_20000_0.8',//1 级会员需要满 2000 积分 购物享9折;2 级会员需要满 5000 积分 购物享88折
-        ];
-        MerchantExtendClass::add($extendData);
-
-        MerchantInitClass::add(['sjId' => $sjId]);
-
-        //创建门店
-        $shopData = [
-            'shopName' => '首店',
-            'sjId' => $sjId,
-            'merchantName' => $sjName,
-            'telephone' => $mobile,
-            'default' => 1,
-            'mainId' => $mainId,
-            'parentId' => $applyData['introSjId'] ?? 0,
-            'parentShopId' => $applyData['introShopId'] ?? 0,
-            'mobile' => $mobile,
-            'introduction' => '欢迎光临',
-            'province' => $applyData['province'] ?? '',
-            'city' => $applyData['city'] ?? '',
-            'dist' => $applyData['dist'] ?? '',
-            'address' => $applyData['address'] ?? '',
-            'floor' => $applyData['floor'] ?? '',
-            'fullAddress' => $applyData['fullAddress'] ?? '',
-            'open' => 1,
-            'lat' => $applyData['lat'] ?? '',
-            'long' => $applyData['long'] ?? '',
-            'img' => ['/example/shop/1.jpg'],
-            'ptStyle' => $ptStyle,
-        ];
-        $shopRespond = \biz\shop\classes\ShopClass::addShop($shopData);
-        $shopId = $shopRespond->id;
-
-        //变更状态和设置商家的默认门店
-        $sjData = [];
-        $sjData['defaultShopId'] = $shopId;
-        $sjStatus = MerchantClass::STATUS_HAS_CHECK;
-        $sjData['status'] = $sjStatus;
-        MerchantClass::updateById($sjId, $sjData);
-
-        //建立供应商和客户关系
-        if ($applyThis) {
-            CustomService::shareBuildTrade($applyData, $shopRespond);
-        }
-
-        return ['sj' => $sj, 'shop' => $shopRespond];
-    }
-
-    //初始化商家信息 ssh 2020.2.11
-    public static function initGhsBaseInfo($applyData, $main, $applyThis = false)
-    {
-        $applyId = $applyData['id'] ?? 0;
-        $mainId = $main->id ?? 0;
-        unset($applyData['id']);
-
-        //生成商家
-        $applyData['accountStyle'] = 0;
-        $applyData['status'] = 1;
-        $applyData['lat'] = $applyData['lat'] ?? (string)0;
-        $applyData['long'] = $applyData['long'] ?? (string)0;
-        $applyData['precision'] = (string)0;
-        $applyData['wxToken'] = stringUtil::buildWxToken(0);
-        $applyData['photoList'] = $applyData['photoList'] ?? '';
-        $applyData['name'] = $applyData['name'] ?? '';
-        $applyData['province'] = $applyData['province'] ?? '';
-        $applyData['city'] = $applyData['city'] ?? '';
-        $applyData['dist'] = $applyData['dist'] ?? '';
-        $applyData['address'] = $applyData['address'] ?? '';
-        $applyData['agentLevel'] = 1;
-        $applyData['parentId'] = $applyData['introSjId'] ?? 0;
-        $deadline = time() + 365 * 86400;
-        $applyData['deadline'] = date("Y-m-d H:i:s", $deadline);
-        $applyData['parentId'] = $applyData['introSjId'] ?? 0;
-        $applyData['parentShopId'] = $applyData['introShopId'] ?? 0;
-
-
-        $sjData = $applyData;
-        $sjData['style'] = dict::getDict('ptStyle', 'ghs');
-        $sj = self::add($sjData, true);
-        $sjId = $sj->id;
-        $sjName = $sj->name ?? 0;
-        $mobile = $applyData['mobile'] ?? '';
-        $ptStyle = $applyData['style'] ?? dict::getDict('ptStyle', 'hd');
-
-        if (!empty($applyId) && $applyThis) {
-            ApplyClass::updateById($applyId, ['sjId' => $sjId]);
-        }
-
-        //生成资产
-        $assetData = [
-            'balance' => 0,
-            'totalVisit' => 0,
-            'totalUser' => 0,
-            'totalMember' => 0,
-            'totalFans' => 0,
-            'totalIntegral' => 0,
-            'totalPoint' => 0,
-            'totalGoods' => 0,
-            'totalRecharge' => 0,
-            'totalOrder' => 0,
-            'totalDeal' => 0,
-            'sjId' => $sjId,
-            'totalIncome' => 0,
-            'totalExpend' => 0,
-        ];
-        MerchantAssetClass::add($assetData);
-
-        //生成商家拓展信息
-        $extendData = [
-            'sjId' => $sjId,
-            'wxAppId' => isset($applyData['wxAppId']) ? $applyData['wxAppId'] : '',
-            'webTitle' => isset($applyData['name']) ? $applyData['name'] : '',
-            'webKeyword' => isset($applyData['name']) ? $applyData['name'] : '',
-            'webDescription' => isset($applyData['name']) ? $applyData['name'] : '',
-            'wxMenuInit' => 0,
-            'wxTMessageInit' => 0,
-            'payment' => 0,//支付功能关闭
-            'recharge' => 0,//充值功能关闭
-            'giveCoupon' => 1,//默认赠送代金劵
-            'giveCouponPrice' => 5,//代金劵金额5元
-            'couponMeetPrice' => 180,//满足金额
-            'couponValidity' => 30,//代金劵有效期30天
-            'alipayAccount' => isset($applyData['alipayAccount']) ? $applyData['alipayAccount'] : '',//提现的支付宝帐号
-            'alipayAccountName' => isset($applyData['alipayAccountName']) ? $applyData['alipayAccountName'] : '',//提现支付宝帐号姓名
-            'gradeList' => '1_2000_0.9I2_5000_0.88I3_10000_0.85I4_20000_0.8',//1 级会员需要满 2000 积分 购物享9折;2 级会员需要满 5000 积分 购物享88折
-        ];
-        MerchantExtendClass::add($extendData);
-
-        MerchantInitClass::add(['sjId' => $sjId]);
-
-        //创建门店
-        $shopData = [
-            'shopName' => '首店',
-            'sjId' => $sjId,
-            'merchantName' => $sjName,
-            'telephone' => $mobile,
-            'default' => 1,
-            'mainId' => $mainId,
-            'parentId' => $applyData['introSjId'] ?? 0,
-            'parentShopId' => $applyData['introShopId'] ?? 0,
-            'mobile' => $mobile,
-            'introduction' => '欢迎光临',
-            'province' => $applyData['province'] ?? '',
-            'city' => $applyData['city'] ?? '',
-            'dist' => $applyData['dist'] ?? '',
-            'address' => $applyData['address'] ?? '',
-            'floor' => $applyData['floor'] ?? '',
-            'fullAddress' => $applyData['fullAddress'] ?? '',
-            'open' => 1,
-            'lat' => $applyData['lat'] ?? '',
-            'long' => $applyData['long'] ?? '',
-            'img' => ['/example/shop/1.jpg'],
-            'ptStyle' => $ptStyle,
-        ];
-        $shopRespond = \biz\shop\classes\ShopClass::addShop($shopData);
-        $shopId = $shopRespond->id;
-
-        //变更状态和设置商家的默认门店
-        $sjData = [];
-        $sjData['defaultShopId'] = $shopId;
-        $sjStatus = MerchantClass::STATUS_HAS_CHECK;
-        $sjData['status'] = $sjStatus;
-        MerchantClass::updateById($sjId, $sjData);
-
-        //建立供应商和客户关系
-        if ($applyThis) {
-            CustomService::shareBuildTrade($applyData, $shopRespond);
-        }
-
-        return ['sj' => $sj, 'shop' => $shopRespond];
-    }
-
     //商家在业务端的权限 ssh 2019.11.25
     public static function getAuthIdList($sjId, $endId)
     {

+ 1 - 0
common/config/bootstrap.php

@@ -8,4 +8,5 @@ Yii::setAlias('@mall', dirname(dirname(__DIR__)) . '/app-mall');
 Yii::setAlias('@biz', dirname(dirname(__DIR__)) . '/biz');
 Yii::setAlias('@bizHd', dirname(dirname(__DIR__)) . '/biz-hd');
 Yii::setAlias('@bizGhs', dirname(dirname(__DIR__)) . '/biz-ghs');
+Yii::setAlias('@bizJd', dirname(dirname(__DIR__)) . '/biz-jd');
 Yii::setAlias('@bizMall', dirname(dirname(__DIR__)) . '/biz-mall');