供货商与客户关系调整

app-ghs/controllers/CustomController.php

@@ -20,7 +20,7 @@ class CustomController extends BaseController
         $get = Yii::$app->request->get();
         $type = isset($get['type']) ? $get['type'] : 0;
         $name = isset($get['name']) ? $get['name'] : '';
-        $where = ['ownSjId' => $this->sjId];
+        $where = ['ownShopId' => $this->shopId];
         switch ($type) {
             case 1:
                 //已开店
@@ -45,7 +45,7 @@ class CustomController extends BaseController
         $get = Yii::$app->request->get();
         $customId = $get['id'] ?? 0;
         $info = CustomService::getCustomInfo($customId);
-        CustomClass::valid($info, $this->sjId);
+        CustomClass::valid($info, $this->shopId);
         util::success($info);
     }
 
@@ -56,7 +56,7 @@ class CustomController extends BaseController
         $debt = isset($get['debt']) ? $get['debt'] : 0;
         $customId = isset($get['customId']) ? $get['customId'] : 0;
         $custom = CustomClass::getById($customId);
-        CustomClass::valid($custom, $this->sjId);
+        CustomClass::valid($custom, $this->shopId);
         CustomClass::debt($custom, $debt);
         util::complete();
     }
@@ -86,7 +86,7 @@ class CustomController extends BaseController
     public function actionDebtList()
     {
         $get = Yii::$app->request->get();
-        $where = ['ownSjId' => $this->sjId, 'isDebt' => 1];
+        $where = ['ownShopId' => $this->shopId, 'isDebt' => 1];
         if (isset($get['name']) && !empty($get['name'])) {
             $where['name'] = ['like', $get['name']];
         }

app-ghs/controllers/ExpressController.php

@@ -22,7 +22,7 @@ class ExpressController extends BaseController
     //获取即时配送快递列表
     public function actionList()
     {
-        $data = MiniExpressService::getAllImmeDelivery("id,deliveryId,deliveryName",['status'=>1]);
+        $data = MiniExpressService::getAllImmeDelivery("id,deliveryId,deliveryName", ['status' => 1]);
         util::success($data);
     }
 
@@ -50,7 +50,7 @@ class ExpressController extends BaseController
         $customId = $post['customId'] ?? 0;
         //获取客户name
         $customInfo = CustomService::getCustomInfo($customId);
-        CustomClass::valid($customInfo, $this->sjId);
+        CustomClass::valid($customInfo, $this->shopId);
 
         //当前门店的地址信息
         $shopInfo = ShopService::getById($this->shopId);
@@ -100,7 +100,7 @@ class ExpressController extends BaseController
     {
         $post = Yii::$app->request->post();
         $expressId = $post['expressId'] ?? 0;// 快递ID
-        $orderSn = $post['orderSn']??'';
+        $orderSn = $post['orderSn'] ?? '';
 
     }
 

app-ghs/controllers/GhsController.php

@@ -15,7 +15,7 @@ class GhsController extends BaseController
     {
         $get = Yii::$app->request->get();
         $name = isset($get['name']) ? $get['name'] : '';
-        $where = ['ownSjId' => $this->sjId];
+        $where = ['ownShopId' => $this->shopId];
         if (!empty($name)) {
             if (stringUtil::isLetter($name)) {
                 $where['py'] = ['like', $name];

app-ghs/controllers/OrderController.php

@@ -81,7 +81,7 @@ class OrderController extends BaseController
         if (empty($custom)) {
             util::fail('客户无效');
         }
-        CustomClass::valid($custom, $this->sjId);
+        CustomClass::valid($custom, $this->shopId);
         $post['customMobile'] = $custom['mobile'] ?? '';
         $customName = $custom['name'] ?? '';
         $post['customName'] = $customName;
@@ -267,8 +267,8 @@ class OrderController extends BaseController
         $city = $get['city'] ?? '';
         $address = $get['address'] ?? '';
         $floor = $get['floor'] ?? '';
-        $customName = $get['customName']??'';
-        $customMobile = $get['customMobile']??'';
+        $customName = $get['customName'] ?? '';
+        $customMobile = $get['customMobile'] ?? '';
         $fullAddress = $province . $city . $address . $floor;
         $sendTime = $get['sendTime'] ?? '';
         $lat = $get['lat'] ?? '';
@@ -291,8 +291,8 @@ class OrderController extends BaseController
         $info = OrderClass::getOrderInfo($orderId);
         OrderClass::valid($info, $this->shopId);
         $expressAddInfo = [
-            'customName'=>$customName,
-            'customMobile'=>$customMobile,
+            'customName' => $customName,
+            'customMobile' => $customMobile,
             'province' => $province,
             'city' => $city,
             'address' => $address,
@@ -533,7 +533,7 @@ class OrderController extends BaseController
     {
         $id = Yii::$app->request->get('id', 0);
         $info = CustomClass::getCustom($id);
-        CustomClass::valid($info, $this->sjId);
+        CustomClass::valid($info, $this->shopId);
         $where = ['customId' => $id, 'debt' => 1];
         $respond = OrderService::getDebtOrderList($where);
         $respond['customInfo'] = $info;

app-ghs/controllers/PurchaseOrderController.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace ghs\controllers;
 
 use biz\ghs\classes\GhsClass;
@@ -8,6 +9,7 @@ use bizGhs\order\models\PurchaseOrder;
 use bizGhs\product\classes\ProductClass;
 use common\components\util;
 use Yii;
+
 class PurchaseOrderController extends BaseController
 {
 
@@ -20,48 +22,48 @@ class PurchaseOrderController extends BaseController
         $post['adminId'] = $this->adminId;
 
 
-        $ghsItemInfo = $post['itemInfo']??'';
-        if(empty($ghsItemInfo)){
+        $ghsItemInfo = $post['itemInfo'] ?? '';
+        if (empty($ghsItemInfo)) {
             util::fail('请选择花材');
         }
-        $ghsItemInfo = json_decode($ghsItemInfo,true); // [{productId:0,itemPrice:1,bigNum:1,smallNum:0}]
-        if(!is_array($ghsItemInfo)){
+        $ghsItemInfo = json_decode($ghsItemInfo, true); // [{productId:0,itemPrice:1,bigNum:1,smallNum:0}]
+        if (!is_array($ghsItemInfo)) {
             util::fail('花材格式不正确');
         }
         //合并
         $ghsItemInfo = PurchaseOrderClass::mergeItemInfo($ghsItemInfo);
         //判断花材格式，是否属于当前门店
-        ProductClass::valid($ghsItemInfo,$this->shopId);
+        ProductClass::valid($ghsItemInfo, $this->shopId);
         //获取供应商信息
         $ghsId = $post['ghsId'];
-        if(empty($ghsId)){
+        if (empty($ghsId)) {
             util::fail("请选择供应商");
         }
         $ghsInfo = GhsClass::getGhsInfo($ghsId);
-        GhsClass::valid($ghsInfo,$this->sjId);
-        $post['ghsInfo']= json_encode($ghsInfo);
+        GhsClass::valid($ghsInfo, $this->shopId);
+        $post['ghsInfo'] = json_encode($ghsInfo);
 
         //判断花材里的信息
-        foreach ($ghsItemInfo as $v){
-            $bigNum = $v['bigNum']??0;
-            $productId = $v['productId']??0;
-            $smallNum = $v['smallNum']??0;
-            if(!isset($v['itemPrice'])){
+        foreach ($ghsItemInfo as $v) {
+            $bigNum = $v['bigNum'] ?? 0;
+            $productId = $v['productId'] ?? 0;
+            $smallNum = $v['smallNum'] ?? 0;
+            if (!isset($v['itemPrice'])) {
                 util::fail('采购价格不能为空');
             }
-            if(!$productId){
+            if (!$productId) {
                 util::fail('花材不存在');
             }
-            if($bigNum <=0 && $smallNum <=0){
+            if ($bigNum <= 0 && $smallNum <= 0) {
                 util::fail('花材数量不能为0');
             }
 
         }
         $post['itemInfo'] = $ghsItemInfo;
         $order = PurchaseOrderClass::addOrder($post);
-        if($order){
+        if ($order) {
             util::success($order);
-        }else{
+        } else {
             util::fail();
         }
     }
@@ -70,8 +72,8 @@ class PurchaseOrderController extends BaseController
     public function actionList()
     {
         $get = Yii::$app->request->get();
-        $orderStatus = $get['status']??'';
-        if($orderStatus){
+        $orderStatus = $get['status'] ?? '';
+        if ($orderStatus) {
             $where['status'] = $orderStatus;
         }
         $where['merchantId'] = $this->sjId;
@@ -79,15 +81,15 @@ class PurchaseOrderController extends BaseController
         $data = PurchaseOrderClass::getOrderList($where);
         //状态统计
         $statData = PurchaseOrderClass::statNum($this->shopId);
-        $data = array_merge($data,$statData);
+        $data = array_merge($data, $statData);
         util::success($data);
     }
 
     //订单详情
     public function actionDetail()
     {
-        $orderSn = Yii::$app->request->get('orderSn','');
-        $orderData = PurchaseOrderClass::getOrderDetail($orderSn,$this->shopId);
+        $orderSn = Yii::$app->request->get('orderSn', '');
+        $orderData = PurchaseOrderClass::getOrderDetail($orderSn, $this->shopId);
         util::success($orderData);
     }
 

app-ghs/controllers/UserController.php

@@ -69,7 +69,7 @@ class UserController extends BaseController
     {
         $userId = Yii::$app->request->get('userId');
         $info = UserService::getFullUserInfo($userId);
-        CustomClass::valid($info, $this->sjId);
+        CustomClass::valid($info, $this->shopId);
         $info['remarkList'] = [];
         util::success($info);
     }

app-hd/controllers/CustomController.php

@@ -30,7 +30,7 @@ class CustomController extends BaseController
     //客户列表 ssh 2019.11.30
     public function actionList()
     {
-        $where = ['sjId' => $this->sjId];
+        $where = ['shopId' => $this->shopId];
         $list = CustomService::getCustomList($where);
         util::success($list);
     }
@@ -40,7 +40,7 @@ class CustomController extends BaseController
     {
         $userId = Yii::$app->request->get('userId');
         $info = CustomClass::getCustomInfo($userId);
-        CustomClass::valid($info, $this->sjId);
+        CustomClass::valid($info, $this->shopId);
         util::success($info);
     }
 

app-hd/controllers/GhsController.php

@@ -13,7 +13,7 @@ class GhsController extends BaseController
     public function actionList()
     {
         $where = [];
-        $where['ownSjId'] = $this->sjId;
+        $where['ownShopId'] = $this->shopId;
         $respond = GhsClass::getGhsList($where);
         util::success($respond);
     }
@@ -23,7 +23,7 @@ class GhsController extends BaseController
     {
         $id = Yii::$app->request->get('id');
         $info = GhsClass::getGhsInfo($id);
-        GhsClass::valid($info, $this->sjId);
+        GhsClass::valid($info, $this->shopId);
         util::success($info);
     }
 

app-hd/controllers/OrderController.php

@@ -47,7 +47,7 @@ class OrderController extends BaseController
         $customId = $post['customId'] ?? 0;
         if (!empty($customId)) {
             $customInfo = CustomClass::getCustomInfo($customId);
-            CustomClass::valid($customInfo, $this->sjId);
+            CustomClass::valid($customInfo, $this->shopId);
             $post['customId'] = $customId;
         }
         //门店订单

app-hd/controllers/PurchaseController.php

@@ -138,7 +138,7 @@ class PurchaseController extends BaseController
     {
         $id = Yii::$app->request->get('id', 0);
         $info = GhsClass::getGhsInfo($id);
-        GhsClass::valid($info, $this->sjId);
+        GhsClass::valid($info, $this->shopId);
         $where = ['ghsId' => $id];
         $respond = PurchaseService::getDebtList($where);
         util::success($respond);

app-hd/controllers/PxApplyController.php

@@ -14,39 +14,39 @@ use Yii;
 class PxApplyController extends BaseController
 {
 
-	//报名申请 ssh 2021.3.17
-	public function actionAdd()
-	{
-		$get = Yii::$app->request->get();
-		$classId = $get['classId'] ?? 0;
-		$info = PxClassClass::getClassInfo($classId);
-		PxClassClass::valid($info, $this->sjId);
-		
-		$customId = $data['customId'] ?? 0;
-		if (!empty($customId)) {
-			$custom = CustomClass::getCustomInfo($customId);
-			CustomClass::valid($custom, $this->sjId);
-		}
-		$get['sjId'] = $this->sjId;
-		$get['prePrice'] = $info['tuition'];
-		$get['actPrice'] = $info['tuition'];
-		$get['shopId'] = $this->shopId;
-		$get['shopAdminId'] = $this->shopAdminId;
-		$get['className'] = $info['name'] ?? '';
-		$get['classCover'] = $info['cover'] ?? '';
-		$get['applyTime'] = date("Y-m-d H:i:s");
-		$get['status'] = PxApplyClass::STATUS_CONFIRM;
-
-		PxApplyClass::addApply($get, $this->shop);
-		util::complete();
-	}
-
-	//新学员 学员管理 ssh 2021.3.17
-	public function actionList()
-	{
-		$where = ['shopId' => $this->shopId];
-		$respond = PxApplyClass::getApplyList($where);
-		util::success($respond);
-	}
+    //报名申请 ssh 2021.3.17
+    public function actionAdd()
+    {
+        $get = Yii::$app->request->get();
+        $classId = $get['classId'] ?? 0;
+        $info = PxClassClass::getClassInfo($classId);
+        PxClassClass::valid($info, $this->sjId);
+
+        $customId = $data['customId'] ?? 0;
+        if (!empty($customId)) {
+            $custom = CustomClass::getCustomInfo($customId);
+            CustomClass::valid($custom, $this->shopId);
+        }
+        $get['sjId'] = $this->sjId;
+        $get['prePrice'] = $info['tuition'];
+        $get['actPrice'] = $info['tuition'];
+        $get['shopId'] = $this->shopId;
+        $get['shopAdminId'] = $this->shopAdminId;
+        $get['className'] = $info['name'] ?? '';
+        $get['classCover'] = $info['cover'] ?? '';
+        $get['applyTime'] = date("Y-m-d H:i:s");
+        $get['status'] = PxApplyClass::STATUS_CONFIRM;
+
+        PxApplyClass::addApply($get, $this->shop);
+        util::complete();
+    }
+
+    //新学员 学员管理 ssh 2021.3.17
+    public function actionList()
+    {
+        $where = ['shopId' => $this->shopId];
+        $respond = PxApplyClass::getApplyList($where);
+        util::success($respond);
+    }
 
 }

app-hd/controllers/UserController.php

@@ -283,7 +283,7 @@ class UserController extends BaseController
             util::fail('没有找到客户信息');
         }
         $info = CustomClass::getCustomInfo($customId);
-        CustomClass::valid($info, $this->sjId);
+        CustomClass::valid($info, $this->shopId);
         $level = $info['member'] ?? 0;
         $discount = $info['discount'] ?? 1;
         $discount = [

app-mall/controllers/PxApplyController.php

@@ -27,7 +27,7 @@ class PxApplyController extends BaseController
         $customId = $this->customId;
         if (!empty($customId)) {
             $custom = CustomClass::getCustomInfo($customId);
-            CustomClass::valid($custom, $this->sjId);
+            CustomClass::valid($custom, $this->shopId);
         }
         $get['sjId'] = $this->sjId;
         $get['prePrice'] = $info['tuition'];

app-pt/controllers/GhsController.php

@@ -35,22 +35,18 @@ class GhsController extends BaseController
         if ($count > 1) {
             util::fail('供货商已经不止一家门店，不知道要绑供货商的哪家店，所以不能再进行绑定');
         }
-        $currentShop = ShopClass::getByCondition(['delStatus' => 0, 'merchantId' => $sjId]);
+        $currentShop = ShopClass::getByCondition(['merchantId' => $sjId, 'delStatus' => 0]);
         if (empty($currentShop)) {
             util::fail('没有找到门店');
         }
         $currentShopId = $currentShop['id'] ?? 0;
-        $has = GhsClass::getByCondition(['ownSjId' => $ownSjId, 'sjId' => $sjId, 'shopId' => $currentShopId]);
-        if (!empty($has)) {
-            util::fail('您已经绑定这个供货商了');
-        }
         $list = ShopClass::getAllByCondition(['merchantId' => $ownSjId, 'delStatus' => 0], null, '*');
         if (empty($list)) {
             util::fail('没有找到门店');
         }
         foreach ($list as $current) {
-            $thisShopId = $current['id'];
-            GhsClass::build($currentShopId, $thisShopId, $ownSjId);
+            $ownShopId = $current['id'];
+            GhsClass::build($currentShopId, $ownShopId, $ownSjId);
         }
         util::complete();
     }

biz-ghs/custom/classes/CustomClass.php

@@ -27,8 +27,8 @@ class CustomClass extends BaseClass
     {
         if ($applyData['style'] == SjClass::STYLE_RETAIL) {
             if ($applyData['introStyle'] == SjClass::STYLE_SUPPLIER) {
-                $has = CustomClass::getByCondition(['ownSjId' => $applyData['introSjId'], 'sjId' => $sjId, 'shopId' => $shopId]);
-                if (empty($has)) {
+                $custom = CustomClass::getByCondition(['ownShopId' => $applyData['introShopId'], 'shopId' => $shopId]);
+                if (empty($custom)) {
                     $customData = [
                         'sjId' => $sjId,//零售商家id
                         'shopId' => $shopId,//零售门店id
@@ -43,21 +43,23 @@ class CustomClass extends BaseClass
                         'long' => $applyData['long'],
                         'lat' => $applyData['lat'],
                     ];
-                    CustomClass::addCustom($customData);
+                    $custom = CustomClass::addCustom($customData);
                 }
+                $customId = $custom['id'];
 
                 $introShopId = $applyData['introShopId'] ?? 0;
                 $ghsShop = ShopClass::getShopInfo($introShopId);
                 if (empty($ghsShop)) {
                     util::fail('没有找到门店');
                 }
-                $ghs = GhsClass::getByCondition(['ownSjId' => $sjId, 'sjId' => $ghsShop['merchantId'], 'shopId' => $ghsShop['id']]);
+                $ghs = GhsClass::getByCondition(['ownShopId' => $shopId, 'shopId' => $ghsShop['id']]);
                 if (empty($ghs)) {
                     $name = $ghsShop['shopName'] ?? '';
                     $py = stringUtil::py($name);
                     $mobile = $ghsShop['mobile'] ?? '';
                     $ghsData = [
                         'sjId' => $ghsShop['merchantId'],
+                        'customId' => $customId,
                         'shopId' => $ghsShop['id'],
                         'ownSjId' => $sjId,
                         'ownShopId' => $sjId,
@@ -73,13 +75,16 @@ class CustomClass extends BaseClass
                         'lat' => $ghsShop['lat'] ?? '',
                         'long' => $ghsShop['long'] ?? '',
                     ];
-                    GhsClass::addGhs($ghsData);
+                    $ghs = GhsClass::addGhs($ghsData);
+                    $ghsId = $ghs['id'] ?? 0;
+                    CustomClass::updateById($customId, ['ghsId' => $ghsId]);
                 }
             }
         }
+
         if ($applyData['style'] == SjClass::STYLE_SUPPLIER) {
             if ($applyData['introStyle'] == SjClass::STYLE_RETAIL) {
-                $has = CustomClass::getByCondition(['ownSjId' => $sjId, 'sjId' => $applyData['introSjId'], 'shopId' => $applyData['introShopId']]);
+                $has = CustomClass::getByCondition(['ownShopId' => $shopId, 'shopId' => $applyData['introShopId']]);
                 $introSjId = $applyData['introSjId'] ?? 0;
                 $introShopId = $applyData['introShopId'] ?? 0;
                 if (empty($has)) {
@@ -102,13 +107,14 @@ class CustomClass extends BaseClass
                         'long' => $applyData['long'],
                         'lat' => $applyData['lat'],
                     ];
-                    CustomClass::addCustom($customData);
+                    $has = CustomClass::addCustom($customData);
                 }
+                $customId = $has['id'] ?? 0;
                 $ghsShop = ShopClass::getShopInfo($shopId);
                 if (empty($ghsShop)) {
                     util::fail('没有找到门店');
                 }
-                $ghs = GhsClass::getByCondition(['ownSjId' => $introSjId, 'sjId' => $sjId, 'shopId' => $shopId]);
+                $ghs = GhsClass::getByCondition(['ownShopId' => $introShopId, 'shopId' => $shopId]);
                 if (empty($ghs)) {
                     $name = $ghsShop['shopName'] ?? '';
                     $py = stringUtil::py($name);
@@ -119,6 +125,7 @@ class CustomClass extends BaseClass
                         'ownSjId' => $introSjId,
                         'ownShopId' => $introShopId,
                         'name' => $name,
+                        'customId' => $customId,
                         'py' => $py,
                         'mobile' => $mobile,
                         'province' => $ghsShop['province'] ?? '',
@@ -130,7 +137,9 @@ class CustomClass extends BaseClass
                         'lat' => $ghsShop['lat'] ?? '',
                         'long' => $ghsShop['long'] ?? '',
                     ];
-                    GhsClass::addGhs($ghsData);
+                    $ghs = GhsClass::addGhs($ghsData);
+                    $ghsId = $ghs['id'] ?? 0;
+                    CustomClass::updateById($customId, ['ghsId' => $ghsId]);
                 }
             }
         }
@@ -194,12 +203,12 @@ class CustomClass extends BaseClass
     }
 
     //权限判断 ssh 2021.1.8
-    public static function valid($custom, $merchantId)
+    public static function valid($custom, $shopId)
     {
         if (empty($custom)) {
             util::fail('没有找到客户');
         }
-        if ($custom['ownSjId'] != $merchantId) {
+        if ($custom['ownShopId'] != $shopId) {
             util::fail('您没有权限操作此客户');
         }
     }

biz-ghs/order/classes/OrderClass.php

@@ -133,89 +133,6 @@ class OrderClass extends BaseClass
         return ['return' => $return, 'product' => $product, 'shop' => $shop];
     }
 
-    //备用方法，需要删除，后面
-    public static function addGhsOrder($respond, $data)
-    {
-        $hdSjId = $data['merchantId'] ?? 0;
-        $hdShopId = $data['shopId'] ?? 0;
-
-        $productList = $data['product'];
-        $productList = self::mergeItemInfo($productList);
-
-        $prePrice = $respond->prePrice;
-        $actPrice = $respond->actPrice;
-        $bigNum = $respond->bigNum;
-        $smallNum = $respond->smallNum;
-
-        //零售的供货商增加订单
-        $ghsId = $data['ghsId'] ?? 0;
-        if (empty($ghsId)) {
-            util::fail('没有找到供货商');
-        }
-        $ghs = GhsClass::getGhsInfo($ghsId);
-        if (empty($ghs)) {
-            util::fail('还是没有找到供货商');
-        }
-        $ghsSjId = $ghs['sjId'] ?? 0;
-        $ghsShopId = $ghs['shopId'] ?? 0;
-        $getType = $data['getType'] ?? 0;
-        $hdOrderId = $respond['id'] ?? 0;
-
-        //增加供货商的客户
-        $custom = CustomClass::getByCondition(['ownSjId' => $ghsSjId, 'sjId' => $hdSjId, 'shopId' => $hdShopId]);
-        if (empty($custom)) {
-            $hdShop = ShopClass::getShopInfo($hdShopId);
-            $name = $hdShop['shopName'] ?? '';
-            $py = stringUtil::py($name);
-            $mobile = $hdShop['mobile'];
-            $customData = [
-                'sjId' => $hdSjId,
-                'shopId' => $hdShopId,
-                'ownSjId' => $ghsSjId,
-                'name' => $name,
-                'py' => $py,
-                'mobile' => $mobile,
-                'city' => $shop['city'] ?? '',
-                'dist' => $shop['dist'] ?? '',
-                'address' => $shop['address'] ?? '',
-                'fullAddress' => $shop['fullAddress'] ?? '',
-                'long' => $shop['long'] ?? '',
-                'lat' => $shop['lat'] ?? '',
-            ];
-            $custom = CustomClass::addCustom($customData);
-        }
-        if (empty($custom)) {
-            util::fail('还是没有找到客户');
-        }
-        $customId = $custom['id'] ?? 0;
-        $customName = $custom['name'] ?? '';
-        $customNamePy = $custom['py'] ?? '';
-        $customAvatar = $custom['avatar'] ?? '';
-        $customMobile = $custom['mobile'] ?? '';
-        $orderData = [
-            'prePrice' => $prePrice,
-            'actPrice' => $actPrice,
-            'bigNum' => $bigNum,
-            'smallNum' => $smallNum,
-            'product' => $productList,
-            'merchantId' => $ghsSjId,
-            'shopId' => $ghsShopId,
-            'sendType' => $getType,
-            'hdOrderId' => $hdOrderId,
-            'customId' => $customId,
-            'customName' => $customName,
-            'customNamePy' => $customNamePy,
-            'customAvatar' => $customAvatar,
-            'customMobile' => $customMobile,
-        ];
-        //增加供货商的销售单
-        $arr = OrderClass::addOrder1($orderData, $ghsShopId);
-        $return = $arr['return'];
-        $id = $return['id'] ?? 0;
-        self::updateById($hdOrderId, ['ghsOrderId' => $id]);
-    }
-
-
     //根据订单编号查询 ssh 2021.19
     public static function getByOrderSn($orderSn)
     {

biz-ghs/order/services/OrderService.php

@@ -26,13 +26,12 @@ class OrderService extends BaseService
         $product = $arr['product'];
         $shop = $arr['shop'];
 
-        $sjId = $data['merchantId'] ?? 0;
-        $shopId = $data['shopId'] ?? 0;
         $customSjId = $custom['sjId'] ?? 0;
         $customShopId = $custom['shopId'] ?? 0;
         $ghsShopAdminId = $data['shopAdminId'] ?? 0;
         $ghsShopAdminName = $data['shopAdminName'] ?? '';
-        $ghs = GhsClass::getByCondition(['ownSjId' => $customSjId, 'sjId' => $sjId, 'shopId' => $shopId]);
+        $ghsId = $custom['ghsId'] ?? 0;
+        $ghs = GhsClass::getById($ghsId);
         if (empty($ghs)) {
             util::fail('没有找到供货商');
         }

biz-hd/custom/classes/CustomClass.php

@@ -15,9 +15,9 @@ class CustomClass extends BaseClass
 
     public static $baseFile = '\bizHd\custom\models\Custom';
 
-    public static function getCustomCacheKey($sjId, $userId)
+    public static function getCustomCacheKey($sjId, $shopId, $userId)
     {
-        return 'hd_custom_key_' . $sjId . '_' . $userId;
+        return 'hd_custom_key_' . $sjId . '_' . $shopId . '_' . $userId;
     }
 
     //创建或获取客户信息 ssh 2021.3.19
@@ -26,7 +26,7 @@ class CustomClass extends BaseClass
         $userId = $user['id'];
         $name = $user['name'] ?? '';
         $mobile = $user['mobile'] ?? '';
-        $key = self::getCustomCacheKey($sjId, $userId);
+        $key = self::getCustomCacheKey($sjId, $shopId, $userId);
         $currentId = Yii::$app->redis->executeCommand('GET', [$key]);
         if (!empty($currentId)) {
             $info = self::getById($currentId);
@@ -36,13 +36,14 @@ class CustomClass extends BaseClass
             }
         }
 
-        $info = self::getByCondition(['sjId' => $sjId, 'userId' => $userId]);
+        $info = self::getByCondition(['shopId' => $shopId, 'userId' => $userId]);
         if (empty($info)) {
             $py = stringUtil::py($name);
             $visitTime = date("Y-m-d H:i:s");
             $data = [
                 'userId' => $userId,
                 'sjId' => $sjId,
+                'shopId' => $shopId,
                 'name' => $name,
                 'py' => $py,
                 'mobile' => $mobile,
@@ -88,9 +89,9 @@ class CustomClass extends BaseClass
         return $list;
     }
 
-    public static function valid($info, $sjId)
+    public static function valid($info, $shopId)
     {
-        if (isset($info['sjId']) && $info['sjId'] == $sjId) {
+        if (isset($info['shopId']) && $info['shopId'] == $shopId) {
             return true;
         }
         util::fail('客户信息无效');

biz-hd/purchase/services/PurchaseService.php

@@ -26,17 +26,15 @@ class PurchaseService extends BaseService
         if (empty($ghs)) {
             util::fail('没有找到供货商');
         }
-        $sjId = $data['merchantId'] ?? 0;
-        $shopId = $data['shopId'] ?? 0;
         $currentShopId = $ghs['shopId'] ?? 0;
         $currentSjId = $ghs['sjId'] ?? 0;
         $product = $data['product'] ?? [];
         $price = 0.01;
-        $custom = CustomClass::getByCondition(['ownSjId' => $currentSjId, 'sjId' => $sjId, 'shopId' => $shopId]);
+        $customId = $ghs['customId'] ?? 0;
+        $custom = CustomClass::getById($customId);
         if (empty($custom)) {
             util::fail('没有找到客户');
         }
-        $customId = $custom['id'] ?? 0;
         $customName = $custom['name'] ?? '';
         $customNamePy = $custom['py'] ?? '';
         $customMobile = $custom['mobile'] ?? '';

biz/ghs/classes/GhsClass.php

@@ -33,6 +33,7 @@ class GhsClass extends BaseClass
                 'sjId' => $thisSjId,
                 'shopId' => $thisShopId,
                 'ownSjId' => $sjId,
+                'ownShopId' => $shopId,
                 'name' => $name,
                 'py' => $py,
                 'mobile' => $ghsShop['mobile'] ?? '',
@@ -52,13 +53,16 @@ class GhsClass extends BaseClass
         $name = $shop['merchantName'] . ' ' . $shop['shopName'];
         $py = stringUtil::py($name);
         $mobile = $shop['mobile'] ?? '';
+        $ghsId = $ghs['id'] ?? 0;
 
-        $custom = CustomClass::getByCondition(['ownSjId' => $thisSjId, 'sjId' => $sjId, 'shopId' => $shopId]);
+        $custom = CustomClass::getByCondition(['ownShopId' => $thisShopId, 'shopId' => $shopId]);
         if (empty($custom)) {
             $customData = [
                 'sjId' => $sjId,
+                'ghsId' => $ghsId,
                 'shopId' => $shopId,
                 'ownSjId' => $thisSjId,
+                'ownShopId' => $thisShopId,
                 'name' => $name,
                 'py' => $py,
                 'mobile' => $mobile,
@@ -69,7 +73,9 @@ class GhsClass extends BaseClass
                 'long' => $shop['long'] ?? '',
                 'lat' => $shop['lat'] ?? '',
             ];
-            CustomClass::addCustom($customData);
+            $custom = CustomClass::addCustom($customData);
+            $customId = $custom['id'] ?? 0;
+            self::updateById($ghsId, ['customId' => $customId]);
         }
 
         return $ghs;
@@ -145,12 +151,12 @@ class GhsClass extends BaseClass
     }
 
     //验证权限 shish 2021.4.11
-    public static function valid($info, $sjId)
+    public static function valid($info, $shopId)
     {
         if (empty($info)) {
             util::fail('供应商不存在');
         }
-        if ($info['ownSjId'] == $sjId) {
+        if ($info['ownShopId'] == $shopId) {
             return true;
         }
         util::fail('您没有权限访问的供应商');

sql.sql

@@ -2363,3 +2363,19 @@ MODIFY COLUMN `stock` int(11) NOT NULL DEFAULT -10000 COMMENT '库存 -100000充
 ALTER TABLE `xhGhsItemClass`
 ADD COLUMN `isDefault`  tinyint(2) UNSIGNED NOT NULL DEFAULT 0 COMMENT '是否默认分类 1是0否' AFTER `adminId`;
 
+
+-------shish 20210706
+ALTER TABLE xhGhs DROP INDEX `ghs`;
+ALTER TABLE xhGhs ADD ownShopId INT NOT NULL DEFAULT 0 COMMENT '所有者门店id' AFTER `ownSjId`;
+ALTER TABLE xhGhsCustom DROP INDEX `custom`;
+ALTER TABLE xhGhsCustom ADD ownShopId INT NOT NULL DEFAULT 0 COMMENT '所有者门店id' AFTER `ownSjId`;
+ALTER TABLE xhCustom DROP INDEX `custom`;
+ALTER TABLE xhCustom ADD shopId INT NOT NULL DEFAULT 0 COMMENT '门店id' AFTER `sjId`;
+TRUNCATE `xhCustom`;
+TRUNCATE `xhGhsCustom`;
+TRUNCATE `xhGhs`;
+ALTER TABLE `xhCustom` ADD UNIQUE INDEX `custom`(`shopId`);
+ALTER TABLE `xhGhsCustom` ADD UNIQUE INDEX `custom`(`ownShopId`,`shopId`);
+ALTER TABLE `xhGhs` ADD UNIQUE INDEX `ghs`(`ownShopId`,`shopId`);
+ALTER TABLE `xhGhs` ADD customId INT NOT NULL DEFAULT 0 COMMENT 'a是b的供应商，则b是a的客户，即customId' AFTER `id`;
+ALTER TABLE `xhGhsCustom` ADD ghsId INT NOT NULL DEFAULT 0 COMMENT 'a是b的客户，则b是a的供货商，即ghsId' AFTER `id`;