1. 批发端（app-ghs)增加 同增配送功能接口（IntraCityController.php）

2. 批发与零售在修改门店信息时，会互相同步门店地址数据；且还会自动更新微信同城配送的门店信息

app-ghs/controllers/IntraCityController.php

@@ -0,0 +1,740 @@
+<?php
+
+namespace ghs\controllers;
+
+use bizHd\express\classes\ExpressOrderClass;
+use bizHd\express\models\ExpressOrder;
+use bizHd\order\classes\OrderGoodsClass;
+use bizHd\user\classes\UserClass;
+use hd\models\IntraCity\StoreFeeForm;
+// 以上类来自零售端
+
+use bizGhs\order\classes\OrderClass;
+use bizGhs\order\classes\OrderItemClass;
+use biz\shop\classes\MainClass;
+use biz\shop\classes\ShopClass;
+use common\components\noticeUtil;
+use common\components\util;
+use common\components\IntraCityExpress;
+use yii\helpers\Json;
+use yii\db\Query;
+use Yii;
+
+/**
+ * 同城配送控制器
+ *
+ * 提供同城配送相关的API接口
+ */
+class IntraCityController extends BaseController
+{
+    public $guestAccess = ['callback'];
+
+    /**
+     * 创建门店
+     * POST /intra-city/create-store
+     */
+    public function actionCreateStore()
+    {
+        try {
+            $shop = $this->shop;
+            $shopName = $shop->shopName ?? '';
+            $sjName = $shop->merchantName ?? '';
+            $name = $shopName == '首店' ? $sjName : $sjName . ' ' . $shopName;
+
+            $storeData = [
+                'out_store_id' => $this->mainId, //自定义门店编号
+                'store_name' => $name,
+                'address_info' => [
+                    'province' => $shop->province,
+                    'city' => $shop->city,
+                    'area' => $shop->dist,
+                    'street' => '',
+                    'house' => $shop->floor ? $shop->address . $shop->floor : $shop->address,
+                    'lat' => $shop->lat,
+                    'lng' => $shop->long,
+                    'phone' => $shop->telephone
+                ]
+            ];
+
+            // 验证必填参数
+            $requiredFields = ['out_store_id', 'store_name', 'address_info'];
+            foreach ($requiredFields as $field) {
+                if (empty($storeData[$field])) {
+                    util::fail("缺少必填参数：{$field}");
+                }
+            }
+
+            // 创建门店前，检查是否已经 开通门店权限 (有wxStoreId，即说明开通了)
+            $shopExt = MainClass::getById($this->mainId, true, false, 'id, wxStoreId');
+
+            // 查询是否存在 wx_store_id，不存在则执行apply
+            if ($shopExt->wxStoreId == '') {
+                $re = IntraCityExpress::applyStore();
+                if (!is_array($re)) {
+                    $re = Json::decode($re, true);
+                }
+                if ($re['errcode'] != 0) {
+                    Yii::error("开通门店权限失败：" . $re['errmsg']);
+                    util::fail('开通门店权限失败');
+                }
+            }
+
+            $result = IntraCityExpress::createStore($storeData);
+            if ($result['errcode'] === 0) {
+                // 保存微信门店编号（wx_store_id）
+                $shopExt->wxStoreId = $result['wx_store_id'];
+                $shopExt->save();
+
+                util::success("门店创建成功", $result);
+            } else {
+                Yii::error("门店创建失败：" . $result['errmsg']);
+                util::fail($result['errmsg']);
+            }
+        } catch (\Exception $e) {
+            Yii::error("门店创建失败：" . $e->getMessage());
+            util::fail("系统出错");
+        }
+    }
+
+    /**
+     * 查询门店创建情况
+     */
+    public function actionStore()
+    {
+        $shopId = $this->shopId;
+        // 首先从门店扩展表查询是否已经创建
+        $shopExt = MainClass::getById($this->mainId, true, false, 'id, wxStoreId');
+        if ($shopExt->wxStoreId == '') { // 不存在，则从微信接口查询
+            $result = IntraCityExpress::getStore($this->mainId);
+            if ($result['errcode'] === 0) {
+                $store = $result['store_list'][0];
+                // 保存 wx_store_id
+                $shopExt->wxStoreId = $store['wx_store_id'];
+                $shopExt->save();
+
+                util::success($store, "门店查询成功");
+            } else {
+                Yii::error("门店查询失败：" . $result['errmsg']);
+                util::error(-1,'门店查询失败');
+            }
+        } else {
+            $field = 'province, city, dist, lat, long, floor, address';
+            $shop = ShopClass::getById($shopId, false, $field);
+            $data = array_merge($shop, $shopExt->toArray());
+            util::success($data, "门店查询成功");
+        }
+    }
+
+    /**
+     * 更新门店
+     */
+    public function actionUpdateStore()
+    {
+        // 首先从门店扩展表查询是否已经创建
+        $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+        if ($shopExt['wxStoreId'] == '') {
+            util::fail('未创建门店，请先创建');
+        }
+
+        $shop = $this->shop;
+        $shopName = $shop->shopName ?? '';
+        $sjName = $shop->merchantName ?? '';
+        $name = $shopName == '首店' ? $sjName : $sjName . ' ' . $shopName;
+
+        $storeData = [
+            'keys' => ['wx_store_id' => $shopExt['wxStoreId']],
+            'content' => [
+                'store_name' => $name,
+                'address_info' => [
+                    'province' => $shop->province,
+                    'city' => $shop->city,
+                    'area' => $shop->dist,
+                    'street' => '',
+                    'house' => $shop->floor ? $shop->address . $shop->floor : $shop->address,
+                    'lat' => $shop->lat,
+                    'lng' => $shop->long,
+                    'phone' => $shop->telephone
+                ],
+                //"order_pattern" => 2,
+                //"service_trans_prefer" => "SFTC" //order_pattern = 2时必填
+            ]
+        ];
+        $result = IntraCityExpress::updateStore($storeData);
+        if ($result['errcode'] === 0) {
+            util::success($result, "门店更新成功");
+        } else {
+            Yii::error("门店更新失败：" . $result['errmsg']);
+            util::fail($result['errmsg']);
+        }
+    }
+
+    /**
+     * 门店运费充值
+     */
+    public function actionStoreCharge()
+    {
+        $post = Yii::$app->request->post();
+        $amount = floatval($post['amount']);
+        $amountTurnFen = $amount * 100;
+        if ($amountTurnFen < 5000) {
+            util::fail('50元起充');
+        }
+
+        $expressId = $post['expressId'];
+        $serviceTransIds = ['SFTC', 'DADA'];
+        if (!in_array($expressId, $serviceTransIds)) {
+            util::fail('快递动力ID出错');
+        }
+
+        $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+        if ($shopExt['wxStoreId'] == '') {
+            util::fail('微信门店编号为空');
+        }
+        $wxStoreId = $shopExt['wxStoreId'];
+        $result = IntraCityExpress::storeCharge($wxStoreId, $expressId, $amountTurnFen);
+        if ($result['errcode'] === 0) {
+            util::success($result, "门店余额充值单已生成");
+        } else {
+            Yii::error("门店余额充值失败：" . $result['errmsg']);
+            util::fail('门店余额充值失败');
+        }
+    }
+
+    /**
+     * 门店余额查询
+     */
+    public function actionStoreBalance()
+    {
+        $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+        if ($shopExt['wxStoreId'] == '') {
+            util::error(-1,'微信门店编号为空');
+        }
+        $wxStoreId = $shopExt['wxStoreId'];
+        $result = IntraCityExpress::getBalance($wxStoreId);
+        if ($result['errcode'] === 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;
+                }
+                if ($item['service_trans_id'] == 'SFTC') {
+                    $data['sf_balance'] = $item['balance'] / 100.0;
+                }
+            }
+            util::success($data, "门店余额查询成功");
+        } else {
+            Yii::error("门店余额查询失败：" . $result['errmsg']);
+            util::fail('门店余额查询失败');
+        }
+    }
+
+    /**
+     * 查询运费
+     */
+    public function actionStoreFee()
+    {
+        $post = Yii::$app->request->post();
+        // 创建表单验证模型
+        $form = new StoreFeeForm();
+        $form->setScenario('store_fee');
+        $form->load($post, ''); // 直接从 post 数据加载，不使用模型名作为前缀
+        // 执行表单验证
+        $form->validateForm();
+
+        $orderId = $post['orderId'];
+        $order = OrderClass::getById($orderId);
+        if (empty($order)) {
+            util::fail('订单出错');
+        }
+        if ($order['mainId'] != $this->mainId) {
+            util::fail('订单出错');
+        }
+        $sn = $order['orderSn'];
+        $shopId = intval($this->shopId);
+        if (empty($shopId)) {
+            util::fail("门店不存在");
+        }
+        $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+        if (empty($shopExt)) {
+            util::fail("微信门店不存在");
+        }
+
+        $itemInfoList = OrderItemClass::getListBySn($sn);
+        $orderType = 2; // 默认是 2。说明：1花束订单 2花材订单 3花束和花材都有
+        if (empty($itemInfoList)) {
+            $orderType = 1;
+        }
+
+        $cargoName = '花材'; // 商品名称，默认是花材
+        $goodsInfoList = OrderGoodsClass::getListBySn($sn);
+        if (count($goodsInfoList) == 1) {
+            $goodsInfo = $goodsInfoList[0];
+            $cargoName = $goodsInfo['name'];
+        } else {
+            if ($orderType != 2) {
+                util::fail("订单商品数量不正确");
+            }
+        }
+
+        $cargo = [
+            'cargo_name' => $cargoName, // 商品名称 -- $order 中没有，要在 goodsInfo 中取
+            'cargo_weight' => intval($post['weight'] * 1000), // 单位：克 -- 把千克转换为克
+            'cargo_price' => intval($post['price'] * 100), // 单位：分 -- 把元转换为分
+            'cargo_type' => IntraCityExpress::GOODS_TYPE_FLOWER,
+            'cargo_num' => intval($post['packageNum'])
+        ];
+        $originalLng = doubleval($post['user_lng']);
+        $originalLat = doubleval($post['user_lat']);
+        $orderData = [
+            //'out_store_id' => $shopId,
+            'wx_store_id' => $shopExt['wxStoreId'],
+            'user_name' => $post['user_name'],
+            'user_phone' => $post['user_phone'],
+            'user_lng' => $originalLng,
+            'user_lat' => $originalLat,
+            'user_address' => $post['user_address'],
+            'cargo' => $cargo,
+            //'use_sandbox' => 1 // 如果不需要沙箱，use_sandbox就不传就好了 -- 踩坑人的经验
+            //'use_sandbox' => getenv('YII_ENV') == 'production' ? 0 : 1 // 根据环境变量判断是否使用沙盒环境 -- 没用，不生效
+        ];
+
+        $result = IntraCityExpress::preAddOrder($orderData);
+        if ($result['errcode'] === 0) {
+            util::success($result, "运费查询成功");
+        } else {
+            Yii::error("运费查询失败：" . json_encode($result));
+            util::fail('运费查询失败' . json_encode($result));
+        }
+    }
+
+    /**
+     * 创建订单
+     * POST /intra-city/create-order
+     */
+    public function actionCreateOrder()
+    {
+        try {
+            $post = Yii::$app->request->post();
+            $orderId = $post['orderId'];
+            $order = OrderClass::getById($orderId);
+            if (empty($order)) {
+                util::fail('订单出错');
+            }
+            if ($order['mainId'] != $this->mainId) {
+                util::fail('订单出错');
+            }
+
+            $sn = $order['orderSn'];
+            $itemInfoList = OrderItemClass::getListBySn($sn, 'id, name, cover, num');
+            $itemList = [];
+            $orderType = 2; // 默认是 2。说明：1花束订单 2花材订单 3花束和花材都有
+            if (empty($itemInfoList)) {
+                $orderType = 1; // 花束订单
+                $goodsInfoList = OrderGoodsClass::getListBySn($sn);
+                $itemCount = 0;
+                foreach ($goodsInfoList as $itemInfo) {
+                    $itemList[] = [
+                        'item_name' => $itemInfo['name'],
+                        'item_pic_url' => $itemInfo['bigCover'],
+                        'count' => $itemInfo['num'],
+                    ];
+                    $itemCount += $itemInfo['num'];
+                }
+                $post['packageNum'] = $itemCount;
+            } else {
+                $itemCount = 0;
+                foreach ($itemInfoList as $itemInfo) {
+                    $itemList[] = [
+                        'item_name' => $itemInfo['name'],
+                        'item_pic_url' => $itemInfo['bigCover'],
+                        'count' => $itemInfo['num'],
+                    ];
+                    $itemCount += $itemInfo['num'];
+                }
+                $post['packageNum'] = $itemCount;
+            }
+
+            $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+            if (empty($shopExt)) {
+                util::fail("微信门店不存在");
+            }
+
+            $cargoName = '花材'; // 商品名称，默认是花材
+            $goodsInfoList = OrderGoodsClass::getListBySn($sn);
+            if (count($goodsInfoList) == 1) {
+                $goodsInfo = $goodsInfoList[0];
+                $cargoName = $goodsInfo['name'];
+            } else {
+                if ($orderType != 2) {
+                    Yii::error('订单商品数量不正确');
+                    util::fail("订单商品数量不正确");
+                }
+            }
+
+            // 通过 userId 获取 openid(小程序OpenId)
+            $user = UserClass::getById($order['userId'], false, 'id, miniOpenId');
+            if (empty($user)) {
+                Yii::error('获取用户openId出错');
+                util::fail('数据出错');
+            }
+
+            $cargo = [
+                'cargo_name' => $cargoName,
+                'cargo_weight' => intval($post['weight'] * 1000),
+                'cargo_type' => IntraCityExpress::GOODS_TYPE_FLOWER,
+                'cargo_num' => intval($post['packageNum']),
+                'cargo_price' => intval($order['actPrice'] * 100), // $order 中有各个价格，请注意
+                'item_list' => $itemList,
+            ];
+
+            //生成 store_order_id
+            $storeOrderId = $orderId;
+            if ($post['isNew'] == 0) { // 如果不是首次用 $orderId 创建快递配送，则要生成新 store_order_id
+                // 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_%']));
+                // $command = $query->createCommand();
+                // $sql = $command->sql;
+                $copyOrderCount = $query->count();
+                $copyOrderCount += 1;
+                $storeOrderId = $orderId . '_copy_' . $copyOrderCount;
+            }
+
+
+            $callbackUrl = Yii::$app->params['hdHost'] . '/intra-city/callback';
+            $orderData = [
+                'wx_store_id' => $shopExt['wxStoreId'],
+                'store_order_id' => $storeOrderId, //同一个门店订单编号要保证唯一，相同的订单号会重入
+                'user_openid' => $user['miniOpenId'],
+                'user_lng' => $post['user_lng'],
+                'user_lat' => $post['user_lat'],
+                'user_address' => $post['user_address'],
+                'user_name' => $post['user_name'],
+                'user_phone' => $post['user_phone'],
+                //'order_seq' => '', // 用于配送员快速寻找到匹配的商品(非必传)
+                'verify_code_type' => 0,
+                'order_detail_path' => '/admin/order/detail?id=' . $orderId, // TODO 使用花掌柜的地址，后期要重新选个地址
+                'callback_url' => $callbackUrl, // 订单状态回调地址（非必传）
+                //'use_sandbox' => getenv('YII_ENV') == 'production' ? 0 : 1, // 是否使用沙箱(非必传)
+                'cargo' => $cargo
+            ];
+            $result = IntraCityExpress::createOrder($orderData);
+
+            if (isset($result['errcode']) && $result['errcode'] === 0) {
+                OrderClass::updateById($orderId, ['sendStatus' => 1]); // 更新订单状态为配送中
+
+                // 保存进 xhExpressOrder 表
+                $orderData = [
+                    'mainId' => $this->mainId,
+                    'shopId' => $this->shopId,
+                    'deliveryId' => isset($result['service_trans_id']) ? $result['service_trans_id'] : '',
+                    'wxOrderId' => isset($result['wx_order_id']) ? $result['wx_order_id'] : '',
+                    'wxStoreId' => isset($result['wx_store_id']) ? $result['wx_store_id'] : '',
+                    'storeOrderId' => isset($result['store_order_id']) ? $result['store_order_id'] : '',
+                    'transOrderId' => isset($result['trans_order_id']) ? $result['trans_order_id'] : '',
+                    'distance' => isset($result['distance']) ? $result['distance'] : 0,
+                    'fee' => isset($result['fee']) ? $result['fee'] : 0,
+                    'fetchCode' => isset($result['fetch_code']) ? $result['fetch_code'] : '',
+                    'orderSeq' => isset($result['order_seq']) ? $result['order_seq'] : ''
+                ];
+                ExpressOrderClass::add($orderData);
+
+                util::success('订单创建成功', ['fee' => $result['fee']]);
+            } else {
+                noticeUtil::push("门店 -- " . $this->mainId . "，订单创建失败：" . json_encode($result));
+                Yii::error("订单创建失败：" . ($result['errmsg'] ?? '未知错误'), 'intracity');
+                util::fail($result['errmsg'] ?? '订单创建失败', $result['errcode'] ?? -1);
+            }
+        } catch (\Exception $e) {
+            Yii::error("订单创建异常：" . $e->getMessage(), 'intracity');
+            util::fail("系统出错");
+        }
+    }
+
+    /**
+     * 查询订单
+     * GET /intra-city/get-order
+     */
+    public function actionGetOrder()
+    {
+        try {
+            $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+            if (empty($shopExt)) {
+                util::fail("微信门店不存在");
+            }
+
+            $post = Yii::$app->request->post();
+            $wxOrderId = isset($post['wx_order_id']) ? $post['wx_order_id'] : '';
+            $orderId = $post['orderId'];
+            $wxStoreId = isset($post['wx_store_id']) ? $post['wx_order_id'] : $shopExt['wxStoreId'];
+
+            if (empty($wxOrderId) && (empty($orderId) || empty($wxStoreId))) {
+                util::fail("参数不足：wx_order_id 或 (order_id + wx_store_id) 必须提供一组");
+            }
+            $order = OrderClass::getById($orderId, false, 'id, mainId, sendStatus');
+            if ($order['mainId'] != $this->mainId) {
+                util::fail('订单未找到');
+            }
+
+            // 检查是否存在重复的订单：如果存在，则使用最后一个订单的 store_order_id
+            $storeOrderId = $orderId; // ------------------------------------- 注意区分：$storeOrderId ， $orderId 。它们有可能不相同
+            $query = (new Query())
+                ->from('xhExpressOrder')
+                ->where(['and',
+                    new \yii\db\Expression('storeOrderId LIKE CONCAT(:prefix, "%")', [':prefix' => $orderId . '_copy_']),
+                    ['status' => 1]
+                ])->orderBy('addTime DESC');
+            $esDatas = $query->all();
+            $count = count($esDatas);
+            if ($count > 0) {
+                $es = $esDatas[0];
+                $storeOrderId = $es['storeOrderId'];
+
+                if ($count > 1) {
+                    noticeUtil::push('同城配送订单重复多于1个. store_order_id:' . $orderId . '，wx_store_id:' . $wxStoreId);
+                }
+            }
+
+
+            $result = IntraCityExpress::queryOrder($wxStoreId, $storeOrderId, $wxOrderId);
+            if (isset($result['errcode']) && $result['errcode'] === 0) {
+                util::success("查询成功", $result);
+            } else {
+                Yii::error("订单查询失败：" . ($result['errmsg'] ?? '未知错误'), 'intracity');
+                util::fail($result['errmsg'] ?? '订单查询失败', $result['errcode'] ?? -1);
+            }
+        } catch (\Exception $e) {
+            Yii::error("订单查询异常：" . $e->getMessage(), 'intracity');
+            util::fail("系统出错");
+        }
+    }
+
+    /**
+     * 取消订单
+     * POST /intra-city/cancel-order
+     */
+    public function actionCancelOrder()
+    {
+        try {
+            $post = Yii::$app->request->post();
+
+            $shopExt = MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+            if (empty($shopExt)) {
+                util::fail("微信门店不存在");
+            }
+
+            $wxOrderId = isset($post['wx_order_id']) ? $post['wx_order_id'] : '';
+            $orderId = $post['orderId'];    //配送订单创建成功后，也会返回的 store_order_id。 即 orderId
+            $wxStoreId = isset($post['wx_store_id']) ? $post['wx_order_id'] : $shopExt['wxStoreId'];
+            if (empty($wxOrderId) && (empty($orderId) || empty($wxStoreId))) {
+                util::fail("参数不足：wx_order_id 或 (store_order_id + wx_store_id) 必须提供一组");
+            }
+            $order = OrderClass::getById($orderId, false, 'id, mainId, sendStatus');
+            if ($order['mainId'] != $this->mainId) {
+                util::fail('订单未找到');
+            }
+            if ($order['sendStatus'] != 1) {
+                util::fail('配送单状态不是配送中');
+            }
+
+            // 检查是否存在重复的订单，如果存在，则使用最后一个订单的 store_order_id
+            $storeOrderId = $orderId; // ------------------------------------- 注意区分：$storeOrderId ， $orderId 。它们有可能不相同
+            $query = (new Query())
+                ->from('xhExpressOrder')
+                ->where(['and',
+                    new \yii\db\Expression('storeOrderId LIKE CONCAT(:prefix, "%")', [':prefix' => $orderId . '_copy_']),
+                    ['status' => 1]
+                ])->orderBy('addTime DESC');
+            // $command = $query->createCommand();
+            // $sql = $command->sql;
+            $esDatas = $query->all();
+
+            $count = count($esDatas);
+            if ($count > 0) {
+                $es = $esDatas[0];
+                $storeOrderId = $es['storeOrderId'];
+
+                if ($count > 1) {
+                    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)) {
+                    $eo->status = ExpressOrder::STATUS_CANCELED;
+                    $eo->cancelTime = date('Y-m-d H:i:s');
+                    $eo->deductfee = $result['deductfee'];
+                    $eo->save();
+                }
+
+                util::success("订单取消成功", $result);
+            } else {
+                if ($result['errcode'] == 934018) { // 93401 -- 订单已取消，请勿重复操作
+                    // 更新订单状态
+                    OrderClass::updateById($orderId, ['sendStatus' => OrderClass::ORDER_STATUS_CANCEL]);//设置为取消状态
+                    util::success("订单取消成功", $result);
+                }
+
+                Yii::error("订单取消失败：" . ($result['errmsg'] ?? '未知错误'), 'intracity');
+                util::fail($result['errmsg'] ?? '订单取消失败', $result['errcode'] ?? -1);
+            }
+        } catch (\Exception $e) {
+            Yii::error("订单取消异常：" . $e->getMessage(), 'intracity');
+            util::fail("系统出错");
+        }
+    }
+
+
+
+    /**
+     * 获取订单列表
+     * GET /intra-city/order-list
+     */
+    public function actionOrderList()
+    {
+
+    }
+
+    /**
+     * 微信回调接口
+     * POST /intra-city/callback
+     */
+    public function actionCallback()
+    {
+        try {
+            $callbackData = Yii::$app->request->post();
+            if (empty($callbackData)) {
+                $postStr = file_get_contents('php://input');
+                // 处理转义字符，将JSON字符串正确解析为数组
+                $postStr = stripslashes($postStr);
+                $callbackData = json_decode($postStr, true);
+
+                if (empty($callbackData)) {
+                    util::fail('回调请求的数据为空');
+                }
+            }
+
+            // 从配置中获取安全token
+            // $token = Yii::$app->params['wx_intracity_token'] ?? 'your_token_here';
+            // $result = IntraCityExpress::handleOrderCallback($callbackData, $token);
+
+            // 记录回调日志
+            Yii::info('同城配送回调：' . json_encode($callbackData, JSON_UNESCAPED_UNICODE));
+
+            $storeOrderId = isset($callbackData['store_order_id']) ? $callbackData['store_order_id'] : 0;
+            $wxStoreId = $callbackData['wx_store_id'];
+
+            // 使用 storeOrderId 与 wxStoreId 去查询 xhExpressOrder 表
+            $eo = ExpressOrderClass::getByCondition(['storeOrderId' => $storeOrderId, 'wxStoreId' => $wxStoreId], true, false);
+            if (empty($eo)) {
+                Yii::error('订单不存在.store_order_id: ' . $storeOrderId . '，wx_store_id: ' . $wxStoreId);
+                echo Json::encode([
+                    'return_code' => 1,
+                    'return_msg' => '系统错误'
+                ]);
+                exit();
+            }
+            // 从 $storeOrderId 提取 orderId
+            $arr = explode('_', $storeOrderId);
+            $orderId = intval($arr[0]);
+
+            $orderStatus = intval($callbackData['order_status']);
+            switch ($orderStatus) {
+                // 订单创建成功
+                case IntraCityExpress::ORDER_STATUS_CREATED:
+                    $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]);
+                    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]);
+                    break;
+
+                // 配送方取消订单
+                case IntraCityExpress::ORDER_STATUS_CANCELED_BY_DELIVERY:
+                    $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]);
+                    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]); //订单创建时已执行了，这儿重复更新
+                    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]); //订单创建时已执行了，这儿重复更新
+                    break;
+
+                // 配送中
+                case IntraCityExpress::ORDER_STATUS_DELIVERING:
+                    $eo->order_status = ExpressOrder::ORDER_STATUS_DELIVERING;
+                    break;
+
+                // 配送员撤单
+                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]);
+                    break;
+
+                // 配送完成
+                case IntraCityExpress::ORDER_STATUS_COMPLETED:
+                    $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]);
+                    break;
+
+                // 配送异常
+                case IntraCityExpress::ORDER_STATUS_EXCEPTION:
+                    $eo->order_status = ExpressOrder::ORDER_STATUS_EXCEPTION;
+                    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);
+                $re = [
+                    'return_code' => 0,
+                    'return_msg' => 'OK'
+                ];
+                echo Json::encode($re);
+                exit();
+            }
+
+            $result = [
+                'return_code' => 0,
+                'return_msg' => 'OK'
+            ];
+            echo Json::encode($result);
+            exit();
+        } catch (\Exception $e) {
+            Yii::error('同城配送回调处理异常：' . $e->getMessage());
+
+            echo Json::encode([
+                'return_code' => 1,
+                'return_msg' => '系统错误'
+            ]);
+            exit();
+        }
+    }
+
+}

app-ghs/controllers/ShopController.php

@@ -18,6 +18,7 @@ use common\components\dict;
 use common\components\dirUtil;
 use common\components\httpUtil;
 use common\components\imgUtil;
+use common\components\IntraCityExpress;
 use common\components\stringUtil;
 use common\components\util;
 use common\components\wxUtil;
@@ -169,10 +170,50 @@ class ShopController extends BaseController
         $post['cutAmount'] = isset($post['cutAmount']) && !empty($post['cutAmount']) ? $post['cutAmount'] : 0;
 
         ShopClass::valid($shop, $this->sjId);
-        //手机号具有唯一性，暂时不允许修改
+        //手机号具有唯一性，暂时不允许修改  --- 同零售端 app-hd/controllers/ShopController.php 保持一致
         unset($post['mobile']);
         $post['img'] = isset($post['img']) && is_array($post['img']) ? json_encode($post['img']) : '';
         \biz\shop\classes\ShopClass::updateShop($shop, $post);
+
+        //同步更新同城配送微信门店
+        // 校验有无经纬度数据，没有不更新（说明地图定位功能不可用了）
+        if($post['lat'] != '' && $post['long'] != '') {
+            $shopExt = \bizGhs\shop\classes\MainClass::getById($this->mainId, false, false, 'id, wxStoreId');
+            if ($shopExt['wxStoreId'] == '') {
+                Yii::error(__CLASS__ . __METHOD__ .' - 未创建门店，请先创建');
+                util::complete();
+            }
+
+            $shopName = isset($post['shopName']) ? $post['shopName'] : '';
+            $sjName = $shop['merchantName'] ?? '';
+            $storeName = $shopName == '首店' ? $sjName : $sjName . ' ' . $shopName;
+
+            $storeData = [
+                'keys' => ['wx_store_id' => $shopExt['wxStoreId']],
+                'content' => [
+                    'store_name' => $storeName,
+                    'address_info' => [
+                        'province' => $post['province'],
+                        'city' => $post['city'],
+                        'area' => $post['dist'],
+                        'street' => '',
+                        'house' => $post['floor'] ? $post['address'] . $post['floor'] : $post['address'],
+                        'lat' => $post['lat'],
+                        'lng' => $post['long'],
+                        'phone' => $post['telephone']
+                    ],
+                    //"order_pattern" => 2,
+                    //"service_trans_prefer" => "SFTC" //order_pattern = 2时必填
+                ]
+            ];
+            $result = IntraCityExpress::updateStore($storeData);
+            if ($result['errcode'] == 0) {
+                Yii::info("同步更新同城配送微信门店成功");
+            } else {
+                Yii::error("同步更新同城配送微信门店失败：" . $result['errmsg']);
+            }
+        }
+
         util::complete();
     }
 

app-hd/controllers/ShopController.php

@@ -112,6 +112,9 @@ class ShopController extends BaseController
         $shop = ShopService::getById($id);
         ShopService::valid($shop, $this->sjId);
         $data['img'] = isset($data['img']) && is_array($data['img']) ? json_encode($data['img']) : '';
+        $mobile = $data['mobile'];
+        //手机号具有唯一性，暂时不允许修改 --- 同批发端 app-ghs/controllers/ShopController.php 保持一致
+        unset($data['mobile']);
         ShopClass::updateShop($shop, $data);
 
         //同步更新同城配送微信门店
@@ -139,7 +142,7 @@ class ShopController extends BaseController
                         'house' => $data['floor'] ? $data['address'] . $data['floor'] : $data['address'],
                         'lat' => $data['lat'],
                         'lng' => $data['long'],
-                        'phone' => $data['mobile']
+                        'phone' => $mobile
                     ],
                     //"order_pattern" => 2,
                     //"service_trans_prefer" => "SFTC" //order_pattern = 2时必填

biz-ghs/order/classes/OrderClass.php

@@ -5,8 +5,6 @@ namespace bizGhs\order\classes;
 use bizGhs\item\classes\ItemClassClass;
 use bizHd\purchase\classes\PurchaseItemClass;
 use common\components\arrayUtil;
-use wkhtmltox\Image\Converter;
-use biz\shop\classes\ShopAdminClass;
 use biz\shop\classes\ShopCapitalClass;
 use biz\shop\classes\ShopClass;
 use biz\shop\classes\ShopExtClass;
@@ -19,25 +17,17 @@ use biz\stat\classes\StatOrderCountClass;
 use biz\stat\classes\StatOutClass;
 use biz\stat\classes\StatRefundClass;
 use biz\stat\classes\StatSaleClass;
-use biz\stock\classes\StockClass;
-use bizGhs\custom\models\Custom;
 use bizGhs\express\services\DadaExpressServices;
-use bizGhs\order\models\Order;
 use bizGhs\order\traits\OrderTrait;
 use bizGhs\product\classes\ProductClass;
 use bizGhs\admin\classes\AdminClass;
 use bizGhs\custom\classes\CustomClass;
 use bizGhs\shop\classes\MainClass;
-use bizGhs\stat\classes\StatYjClass;
 use bizGhs\stock\classes\StockRecordClass;
-use bizGhs\stock\services\StockRecordService;
 use bizHd\purchase\classes\PurchaseClass;
 use bizHd\stat\classes\StatIncomeClass;
-use bizHd\stat\classes\StatOrderClass;
 use common\components\dict;
-use common\components\httpUtil;
 use common\components\imgUtil;
-use common\components\noticeUtil;
 use common\components\orderSn;
 use common\components\printUtil;
 use common\components\stringUtil;

biz/shop/classes/ShopClass.php

@@ -148,7 +148,7 @@ class ShopClass extends BaseClass
         $name = $default == 1 && $shopName == '首店' ? $sjName : $sjName . ' ' . $shopName;
         $shopUpdate = [
             'name' => $name,
-            'mobile' => $data['mobile'] ?? '',
+            //'mobile' => $data['mobile'] ?? '', // 由于前面已经 unset 掉 mobile，所以会为""，而把原有值置空
             'province' => $data['province'] ?? '',
             'city' => $data['city'] ?? '',
             'dist' => $data['dist'] ?? '',
@@ -159,6 +159,24 @@ class ShopClass extends BaseClass
             'lat' => $data['lat'] ?? '',
             'long' => $data['long'] ?? ''
         ];
+
+        // 如果是批发端，则变更零售端的地址
+        if ($ptStyle == dict::getDict('ptStyle', 'ghs')) {
+            //$lsShop = self::getById($id, false, 'lsShopId');
+            $lsShopId = intval($shop['lsShopId']);
+            if($lsShopId > 0){
+                $re = self::updateById($lsShopId, $shopUpdate);
+            }
+        }
+        // 如果是零售端，则变更批发端的地址
+        if ($ptStyle == dict::getDict('ptStyle', 'hd')) {
+            //$pfShop = self::getById($id, false, 'pfShopId');
+            $pfShopId = intval($shop['pfShopId']);
+            if($pfShopId > 0){
+                $re = self::updateById($pfShopId, $shopUpdate);
+            }
+        }
+
         $where = ['sjId' => $sjId, 'shopId' => $id];
         if ($ptStyle == dict::getDict('ptStyle', 'ghs')) {
             //如果是批发店，更新供货商信息