Merge branch 'shish-cb' into dev

app-ghs/controllers/ExpressController.php

@@ -39,9 +39,17 @@ class ExpressController extends BaseController
             $deliveryId = 'TEST';
             $bizId = 'test_biz_id';
         }
+
+        $admin = $this->admin;
+        $openId = $admin->ghsMiniOpenId ?? '';
+        if (empty($openId)) {
+            util::fail('请用小程序取消');
+        }
+
         $params = [
             'deliveryId' => $deliveryId,
             'bizId' => $bizId,
+            'openId' => $openId,
         ];
         ExpressClass::cancel($params, $order);
     }