门店获取优化

app-hd/controllers/IntraCityController.php

@@ -35,15 +35,15 @@ class IntraCityController extends BaseController
     public function actionCreateStore()
     {
         try {
-            $shopId = intval($this->shopId);
-            if (empty($shopId)) {
-                $shopId = $this->shopId;
-            }
-            $shop = ShopClass::getById($shopId, true, 'id, merchantName, province, city, dist, address, floor, lat, long, telephone');
+            $shopId = $this->shopId;
+            $shop = $this->shop;
+            $shopName = $shop->shopName ?? '';
+            $sjName = $shop->merchantName ?? '';
+            $name = $shopName == '首店' ? $sjName : $sjName . ' ' . $shopName;
 
             $storeData = [
                 'out_store_id' => $shop->id,
-                'store_name' => $shop->merchantName,
+                'store_name' => $name,
                 'address_info' => [
                     'province' => $shop->province,
                     'city' => $shop->city,
@@ -65,7 +65,7 @@ class IntraCityController extends BaseController
             }
 
             // 创建门店前，检查是否已经 开通门店权限 (有wxStoreId，即说明开通了)
-            $shopExt = ShopExtClass::getByCondition(['shopId'=>$shopId], true, false, 'id, wxStoreId');
+            $shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], true, false, 'id, wxStoreId');
             // 查询是否存在 wx_store_id，不存在则执行apply
             if ($shopExt->wxStoreId == '') {
                 $re = IntraCityExpress::applyStore();
@@ -100,13 +100,9 @@ class IntraCityController extends BaseController
      */
     public function actionStore()
     {
-        $shopId = intval($this->shopId);
-        if (empty($shopId)) {
-            util::fail("门店不存在");
-        }
-
+        $shopId = $this->shopId;
         // 首先从门店扩展表查询是否已经创建
-        $shopExt = ShopExtClass::getByCondition(['shopId'=>$shopId], true, false, 'id, wxStoreId');
+        $shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], true, false, 'id, wxStoreId');
         if ($shopExt->wxStoreId == '') { // 不存在，则从微信接口查询
             $result = IntraCityExpress::getStore($shopId);
             if ($result['errcode'] === 0) {
@@ -133,22 +129,22 @@ class IntraCityController extends BaseController
      */
     public function actionUpdateStore()
     {
-        $shopId = intval($this->shopId);
-        if (empty($shopId)) {
-            util::fail("门店不存在");
-        }
+        $shopId = $this->shopId;
         // 首先从门店扩展表查询是否已经创建
-        $shopExt = ShopExtClass::getByCondition(['shopId'=>$shopId], false, false, 'id, wxStoreId');
+        $shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], false, false, 'id, wxStoreId');
         if ($shopExt['wxStoreId'] == '') {
             util::fail('未创建门店，请先创建');
         }
 
-        $shop = ShopClass::getById($shopId, true, 'id, merchantName, province, city, dist, address, floor, lat, long, telephone');
+        $shop = $this->shop;
+        $shopName = $shop->shopName ?? '';
+        $sjName = $shop->merchantName ?? '';
+        $name = $shopName == '首店' ? $sjName : $sjName . ' ' . $shopName;
 
         $storeData = [
-            'keys' => ['wx_store_id'=>$shopExt['wxStoreId']],
+            'keys' => ['wx_store_id' => $shopExt['wxStoreId']],
             'content' => [
-                'store_name' => $shop->merchantName,
+                'store_name' => $name,
                 'address_info' => [
                     'province' => $shop->province,
                     'city' => $shop->city,
@@ -160,7 +156,7 @@ class IntraCityController extends BaseController
                     'phone' => $shop->telephone
                 ],
                 //"order_pattern" => 2,
-		        //"service_trans_prefer" => "SFTC" //order_pattern = 2时必填
+                //"service_trans_prefer" => "SFTC" //order_pattern = 2时必填
             ]
         ];
         $result = IntraCityExpress::updateStore($storeData);
@@ -196,7 +192,7 @@ class IntraCityController extends BaseController
             util::fail("门店不存在");
         }
 
-        $shopExt = ShopExtClass::getByCondition(['shopId'=>$shopId], false, false, 'id, wxStoreId');
+        $shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], false, false, 'id, wxStoreId');
         if ($shopExt['wxStoreId'] == '') {
             util::fail('微信门店编号为空');
         }
@@ -215,23 +211,15 @@ class IntraCityController extends BaseController
      */
     public function actionStoreBalance()
     {
-        $shopId = intval($this->shopId);
-        if (empty($shopId)) {
-            util::fail("门店不存在");
-        }
-        $shopId = intval($this->shopId);
-        if (empty($shopId)) {
-            util::fail("门店不存在");
-        }
-
-        $shopExt = ShopExtClass::getByCondition(['shopId'=>$shopId], false, false, 'id, wxStoreId');
+        $shopId = $this->shopId;
+        $shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], false, false, 'id, wxStoreId');
         if ($shopExt['wxStoreId'] == '') {
             util::fail('微信门店编号为空');
         }
         $wxStoreId = $shopExt['wxStoreId'];
         $result = IntraCityExpress::getBalance($wxStoreId);
         if ($result['errcode'] === 0) {
-            $data = ['all_balance' => $result['all_balance']/100.0];
+            $data = ['all_balance' => $result['all_balance'] / 100.0];
             foreach ($result['balance_detail'] as $item) {
                 if ($item['service_trans_id'] == 'DADA') {
                     $data['dada_balance'] = $item['balance'] / 100.0;
@@ -273,7 +261,7 @@ class IntraCityController extends BaseController
         if (empty($shopId)) {
             util::fail("门店不存在");
         }
-        $shopExt = ShopExtClass::getByCondition(['shopId'=>$shopId], false, false, 'id, wxStoreId');
+        $shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], false, false, 'id, wxStoreId');
 
         $itemInfoList = OrderItemClass::getListBySn($sn);
         $orderType = 2; // 默认是 2。说明：1花束订单 2花材订单 3花束和花材都有
@@ -291,7 +279,7 @@ class IntraCityController extends BaseController
                 util::fail("订单商品数量不正确");
             }
         }
-        
+
         $cargo = [
             'cargo_name' => $cargoName, // 商品名称 -- $order 中没有，要在 goodsInfo 中取
             'cargo_weight' => intval($post['weight'] * 1000), // 单位：克 -- 把千克转换为克
@@ -313,7 +301,7 @@ class IntraCityController extends BaseController
             //'use_sandbox' => 1 // 如果不需要沙箱，use_sandbox就不传就好了 -- 踩坑人的经验
             //'use_sandbox' => getenv('YII_ENV') == 'production' ? 0 : 1 // 根据环境变量判断是否使用沙盒环境 -- 没用，不生效
         ];
-        
+
         $result = IntraCityExpress::preAddOrder($orderData);
         if ($result['errcode'] === 0) {
             util::success($result, "运费查询成功");
@@ -374,7 +362,7 @@ class IntraCityController extends BaseController
             if (empty($shopId)) {
                 util::fail("门店不存在");
             }
-            $shopExt = ShopExtClass::getByCondition(['shopId'=>$shopId], false, false, 'id, wxStoreId');
+            $shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], false, false, 'id, wxStoreId');
 
             $cargoName = '花材'; // 商品名称，默认是花材
             $goodsInfoList = OrderGoodsClass::getListBySn($sn);
@@ -394,7 +382,7 @@ class IntraCityController extends BaseController
                 Yii::error('获取用户openId出错');
                 util::fail('数据出错');
             }
-            
+
             $cargo = [
                 'cargo_name' => $cargoName,
                 'cargo_weight' => intval($post['weight'] * 1000),
@@ -410,7 +398,7 @@ class IntraCityController extends BaseController
                 // store_order_id 门店订单编号, 即 orderId。如果是重新配送的第n次，订单编号的命名规则为：orderId_copy_n
                 $query = (new Query())
                     ->from('xhExpressOrder')
-                    ->where(new \yii\db\Expression('storeOrderId LIKE CONCAT(:prefix, "%")', [':prefix' => $orderId.'_copy_%']));
+                    ->where(new \yii\db\Expression('storeOrderId LIKE CONCAT(:prefix, "%")', [':prefix' => $orderId . '_copy_%']));
                 // $command = $query->createCommand();
                 // $sql = $command->sql;
                 $copyOrderCount = $query->count();
@@ -439,7 +427,7 @@ class IntraCityController extends BaseController
             $result = IntraCityExpress::createOrder($orderData);
 
             if (isset($result['errcode']) && $result['errcode'] === 0) {
-                OrderClass::updateById($orderId, ['sendStatus'=>1]); // 更新订单状态为配送中
+                OrderClass::updateById($orderId, ['sendStatus' => 1]); // 更新订单状态为配送中
 
                 // 保存进 xhExpressOrder 表
                 $orderData = [
@@ -459,7 +447,7 @@ class IntraCityController extends BaseController
 
                 util::success('订单创建成功', ['fee' => $result['fee']]);
             } else {
-                noticeUtil::push("门店 -- ".$shopId."，订单创建失败：" . json_encode($result));
+                noticeUtil::push("门店 -- " . $shopId . "，订单创建失败：" . json_encode($result));
                 Yii::error("订单创建失败：" . ($result['errmsg'] ?? '未知错误'), 'intracity');
                 util::fail($result['errmsg'] ?? '订单创建失败', $result['errcode'] ?? -1);
             }
@@ -476,11 +464,8 @@ class IntraCityController extends BaseController
     public function actionGetOrder()
     {
         try {
-            $shopId = intval($this->shopId);
-            if (empty($shopId)) {
-                util::fail("门店不存在");
-            }
-            $shopExt = ShopExtClass::getByCondition(['shopId'=>$shopId], false, false, 'id, wxStoreId');
+            $shopId = $this->shopId;
+            $shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], false, false, 'id, wxStoreId');
 
             $post = Yii::$app->request->post();
             $wxOrderId = isset($post['wx_order_id']) ? $post['wx_order_id'] : '';
@@ -491,7 +476,7 @@ class IntraCityController extends BaseController
                 util::fail("参数不足：wx_order_id 或 (order_id + wx_store_id) 必须提供一组");
             }
             $order = OrderClass::getById($orderId, false, 'id, mainId, sendStatus');
-            if ($order['mainId'] != $this->mainId){
+            if ($order['mainId'] != $this->mainId) {
                 util::fail('订单未找到');
             }
 
@@ -500,7 +485,7 @@ class IntraCityController extends BaseController
             $query = (new Query())
                 ->from('xhExpressOrder')
                 ->where(['and',
-                    new \yii\db\Expression('storeOrderId LIKE CONCAT(:prefix, "%")', [':prefix' => $orderId.'_copy_']),
+                    new \yii\db\Expression('storeOrderId LIKE CONCAT(:prefix, "%")', [':prefix' => $orderId . '_copy_']),
                     ['status' => 1]
                 ])->orderBy('addTime DESC');
             $esDatas = $query->all();
@@ -510,7 +495,7 @@ class IntraCityController extends BaseController
                 $storeOrderId = $es['storeOrderId'];
 
                 if ($count > 1) {
-                    noticeUtil::push('同城配送订单重复多于1个. store_order_id:'.$orderId.'，wx_store_id:'.$wxStoreId);
+                    noticeUtil::push('同城配送订单重复多于1个. store_order_id:' . $orderId . '，wx_store_id:' . $wxStoreId);
                 }
             }
 
@@ -541,7 +526,7 @@ class IntraCityController extends BaseController
             if (empty($shopId)) {
                 util::fail("门店不存在");
             }
-            $shopExt = ShopExtClass::getByCondition(['shopId'=>$shopId], false, false, 'id, wxStoreId');
+            $shopExt = ShopExtClass::getByCondition(['shopId' => $shopId], false, false, 'id, wxStoreId');
 
             $wxOrderId = isset($post['wx_order_id']) ? $post['wx_order_id'] : '';
             $orderId = $post['orderId'];    //配送订单创建成功后，也会返回的 store_order_id。 即 orderId
@@ -550,7 +535,7 @@ class IntraCityController extends BaseController
                 util::fail("参数不足：wx_order_id 或 (store_order_id + wx_store_id) 必须提供一组");
             }
             $order = OrderClass::getById($orderId, false, 'id, mainId, sendStatus');
-            if ($order['mainId'] != $this->mainId){
+            if ($order['mainId'] != $this->mainId) {
                 util::fail('订单未找到');
             }
             if ($order['sendStatus'] != 1) {
@@ -561,8 +546,8 @@ class IntraCityController extends BaseController
             $storeOrderId = $orderId; // ------------------------------------- 注意区分：$storeOrderId ， $orderId 。它们有可能不相同
             $query = (new Query())
                 ->from('xhExpressOrder')
-                ->where(['and', 
-                    new \yii\db\Expression('storeOrderId LIKE CONCAT(:prefix, "%")', [':prefix' => $orderId.'_copy_']),
+                ->where(['and',
+                    new \yii\db\Expression('storeOrderId LIKE CONCAT(:prefix, "%")', [':prefix' => $orderId . '_copy_']),
                     ['status' => 1]
                 ])->orderBy('addTime DESC');
             // $command = $query->createCommand();
@@ -575,16 +560,16 @@ class IntraCityController extends BaseController
                 $storeOrderId = $es['storeOrderId'];
 
                 if ($count > 1) {
-                    noticeUtil::push('同城配送订单重复多于1个. store_order_id:'.$orderId.'，wx_store_id:'.$wxStoreId);
+                    noticeUtil::push('同城配送订单重复多于1个. store_order_id:' . $orderId . '，wx_store_id:' . $wxStoreId);
                 }
             }
 
             $result = IntraCityExpress::cancelOrder($wxOrderId, $storeOrderId, $wxStoreId);
             if (isset($result['errcode']) && $result['errcode'] === 0) {
                 // 更新订单状态
-                OrderClass::updateById($orderId, ['sendStatus'=>OrderClass::ORDER_STATUS_CANCEL]);//设置为取消状态
-                $eo = ExpressOrderClass::getByCondition(['storeOrderId'=>$storeOrderId, 'wxStoreId'=>$wxStoreId], true);
-                if(!empty($eo)) {
+                OrderClass::updateById($orderId, ['sendStatus' => OrderClass::ORDER_STATUS_CANCEL]);//设置为取消状态
+                $eo = ExpressOrderClass::getByCondition(['storeOrderId' => $storeOrderId, 'wxStoreId' => $wxStoreId], true);
+                if (!empty($eo)) {
                     $eo->status = ExpressOrder::STATUS_CANCELED;
                     $eo->cancelTime = date('Y-m-d H:i:s');
                     $eo->deductfee = $result['deductfee'];
@@ -595,7 +580,7 @@ class IntraCityController extends BaseController
             } else {
                 if ($result['errcode'] == 934018) { // 93401 -- 订单已取消，请勿重复操作
                     // 更新订单状态
-                    OrderClass::updateById($orderId, ['sendStatus'=>OrderClass::ORDER_STATUS_CANCEL]);//设置为取消状态
+                    OrderClass::updateById($orderId, ['sendStatus' => OrderClass::ORDER_STATUS_CANCEL]);//设置为取消状态
                     util::success("订单取消成功", $result);
                 }
 
@@ -692,9 +677,9 @@ class IntraCityController extends BaseController
             $wxStoreId = $callbackData['wx_store_id'];
 
             // 使用 storeOrderId 与 wxStoreId 去查询 xhExpressOrder 表
-            $eo = ExpressOrderClass::getByCondition(['storeOrderId'=>$storeOrderId, 'wxStoreId'=>$wxStoreId], true, false);
+            $eo = ExpressOrderClass::getByCondition(['storeOrderId' => $storeOrderId, 'wxStoreId' => $wxStoreId], true, false);
             if (empty($eo)) {
-                Yii::error('订单不存在.store_order_id: '.$storeOrderId.'，wx_store_id: '.$wxStoreId);
+                Yii::error('订单不存在.store_order_id: ' . $storeOrderId . '，wx_store_id: ' . $wxStoreId);
                 echo Json::encode([
                     'return_code' => 1,
                     'return_msg' => '系统错误'
@@ -712,14 +697,14 @@ class IntraCityController extends BaseController
                     $eo->order_status = ExpressOrder::ORDER_STATUS_CREATED;
                     $eo->status = ExpressOrder::STATUS_CREATED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 配送中|已发货
-                    OrderClass::updateById($orderId, ['status'=>OrderClass::ORDER_STATUS_SENDING, 'sendStatus'=>OrderClass::SEND_STATUS_SENDING]);
+                    OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_SENDING, 'sendStatus' => OrderClass::SEND_STATUS_SENDING]);
                     break;
 
                 // 商家取消订单
                 case IntraCityExpress::ORDER_STATUS_CANCELED_BY_MERCHANT:
                     $eo->order_status = ExpressOrder::ORDER_STATUS_CANCELED_BY_MERCHANT;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|取消
-                    OrderClass::updateById($orderId, ['status'=>OrderClass::ORDER_STATUS_UN_SEND, 'sendStatus'=>OrderClass::SEND_STATUS_CANCEL]);
+                    OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_UN_SEND, 'sendStatus' => OrderClass::SEND_STATUS_CANCEL]);
                     break;
 
                 // 配送方取消订单
@@ -727,21 +712,21 @@ class IntraCityController extends BaseController
                     $eo->order_status = ExpressOrder::ORDER_STATUS_CANCELED_BY_DELIVERY;
                     $eo->status = ExpressOrder::STATUS_CANCELED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|取消
-                    OrderClass::updateById($orderId, ['status'=>OrderClass::ORDER_STATUS_UN_SEND, 'sendStatus'=>OrderClass::SEND_STATUS_CANCEL]);
+                    OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_UN_SEND, 'sendStatus' => OrderClass::SEND_STATUS_CANCEL]);
                     break;
 
                 // 配送员接单
                 case IntraCityExpress::ORDER_STATUS_ACCEPTED:
                     $eo->order_status = ExpressOrder::ORDER_STATUS_ACCEPTED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 配送中|已发货
-                    OrderClass::updateById($orderId, ['status'=>OrderClass::ORDER_STATUS_SENDING, 'sendStatus'=>OrderClass::SEND_STATUS_SENDING]); //订单创建时已执行了，这儿重复更新
+                    OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_SENDING, 'sendStatus' => OrderClass::SEND_STATUS_SENDING]); //订单创建时已执行了，这儿重复更新
                     break;
 
                 // 配送员到店
                 case IntraCityExpress::ORDER_STATUS_ARRIVED:
                     $eo->order_status = ExpressOrder::ORDER_STATUS_ARRIVED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 配送中|已发货
-                    OrderClass::updateById($orderId, ['status'=>OrderClass::ORDER_STATUS_SENDING, 'sendStatus'=>OrderClass::SEND_STATUS_SENDING]); //订单创建时已执行了，这儿重复更新
+                    OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_SENDING, 'sendStatus' => OrderClass::SEND_STATUS_SENDING]); //订单创建时已执行了，这儿重复更新
                     break;
 
                 // 配送中
@@ -753,7 +738,7 @@ class IntraCityController extends BaseController
                 case IntraCityExpress::ORDER_STATUS_WITHDRAWN:
                     $eo->order_status = ExpressOrder::ORDER_STATUS_WITHDRAWN;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 待配送|未发货
-                    OrderClass::updateById($orderId, ['status'=>OrderClass::ORDER_STATUS_UN_SEND, 'sendStatus'=>OrderClass::SEND_STATUS_UNSEND]);
+                    OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_UN_SEND, 'sendStatus' => OrderClass::SEND_STATUS_UNSEND]);
                     break;
 
                 // 配送完成
@@ -761,19 +746,19 @@ class IntraCityController extends BaseController
                     $eo->order_status = ExpressOrder::ORDER_STATUS_COMPLETED;
                     $eo->status = ExpressOrder::STATUS_COMPLETED;
                     // 更新 xhOrder 表的订单状态与配送状态 -- 已完成|已送达
-                    OrderClass::updateById($orderId, ['status'=>OrderClass::ORDER_STATUS_COMPLETE, 'sendStatus'=>OrderClass::SEND_STATUS_COMPLETED]);
+                    OrderClass::updateById($orderId, ['status' => OrderClass::ORDER_STATUS_COMPLETE, 'sendStatus' => OrderClass::SEND_STATUS_COMPLETED]);
                     break;
 
                 // 配送异常
                 case IntraCityExpress::ORDER_STATUS_EXCEPTION:
                     $eo->order_status = ExpressOrder::ORDER_STATUS_EXCEPTION;
-                    noticeUtil::push('同城配送异常 --- store_order_id(orderId):'.$storeOrderId.'，wx_store_id:'.$wxStoreId);
+                    noticeUtil::push('同城配送异常 --- store_order_id(orderId):' . $storeOrderId . '，wx_store_id:' . $wxStoreId);
                     break;
             }
             $re = $eo->save();
             if (!$re) {
-                noticeUtil::push('同城配送回调更新订单状态失败. store_order_id:'.$storeOrderId.'，wx_store_id:'.$wxStoreId.'，status:'.$eo->status);
-                Yii::error('更新订单状态失败. store_order_id:'.$storeOrderId.'，wx_store_id:'.$wxStoreId.'，status:'.$eo->status);
+                noticeUtil::push('同城配送回调更新订单状态失败. store_order_id:' . $storeOrderId . '，wx_store_id:' . $wxStoreId . '，status:' . $eo->status);
+                Yii::error('更新订单状态失败. store_order_id:' . $storeOrderId . '，wx_store_id:' . $wxStoreId . '，status:' . $eo->status);
                 $re = [
                     'return_code' => 0,
                     'return_msg' => 'OK'