id

app-hd/controllers/IntraCityController.php

@@ -416,8 +416,8 @@ class IntraCityController extends BaseController
                 'item_list' => $itemList,
             ];
 
-            //生成 store_order_id
-            $storeOrderId = $orderId;
+            //生成 store_order_id，加统一后缀，避免线上线下ID命中
+            $storeOrderId = $orderId . '_express_';
             if ($order['sendStatus'] == 3) { // 如果不是首次用 $orderId 创建快递配送，则要生成新 store_order_id
                 // store_order_id 门店订单编号, 即 orderId。如果是重新配送的第n次，订单编号的命名规则为：orderId_copy_n
                 $query = (new Query())
@@ -427,7 +427,12 @@ class IntraCityController extends BaseController
                 // $sql = $command->sql;
                 $copyOrderCount = $query->count();
                 $copyOrderCount += 1;
-                $storeOrderId = $orderId . '_copy_' . $copyOrderCount;
+                //区分线上线下
+                if (getenv('YII_ENV') == 'production') {
+                    $storeOrderId = $orderId . '_express_new_' . $copyOrderCount;
+                } else {
+                    $storeOrderId = $orderId . '_express_cs_new_' . $copyOrderCount;
+                }
             }
 
             $callbackUrl = Yii::$app->params['hdHost'] . '/intra-city/callback';