Merge branch 'shish-cb' into dev

biz-ghs/express/classes/ExpressClass.php

@@ -178,21 +178,8 @@ class ExpressClass extends BaseClass
                 'service_name' => $serviceName, // 服务名称
             ],
         ];
+        Yii::info('req:' . json_encode($data));
         $ret = expressUtil::addOrder($merchant, $data, $ptStyle);
-//        $ret = [
-//            'errcode' => 0,
-//            'errmsg' => 'ok',
-//            'order_id' => 'XSD_CS26323329',
-//            'waybill_id' => 'XSD_CS26323329_waybill_id',
-//            'delivery_resultcode' => 0,
-//            'delivery_resultmsg' => 'ok',
-//            'waybill_data' => [
-//                'key' => 'TEST_mark',
-//                'value' => '888-666-666',
-//            ],
-//            'is_correct_sender' => 0,
-//            'is_correct_receiver' => 0,
-//        ];
         if ($ret['errcode'] == 0) {
             $wayBillId = $ret['waybill_id'] ?? 0;
             $wayBillName = '顺丰速运';