sa2kit 1.6.113 → 1.6.114

package/dist/showmasterpiece/index.mjs

@@ -1516,46 +1516,46 @@ var createCartEventTarget = () => {
 createCartEventTarget();
 
 // src/business/showmasterpiece/service/client-business/bookingService.ts
+function appendBookingCredentials(path, credentials) {
+  if (!credentials?.qqNumber?.trim() || !credentials?.phoneNumber?.trim()) {
+    return path;
+  }
+  const params = new URLSearchParams({
+    qqNumber: credentials.qqNumber.trim(),
+    phoneNumber: credentials.phoneNumber.trim()
+  });
+  return `${path}?${params.toString()}`;
+}
+function bookingCredentialsBody(credentials) {
+  if (!credentials?.qqNumber?.trim() || !credentials?.phoneNumber?.trim()) {
+    return void 0;
+  }
+  return JSON.stringify({
+    qqNumber: credentials.qqNumber.trim(),
+    phoneNumber: credentials.phoneNumber.trim()
+  });
+}
+async function parseErrorMessage(response, fallback) {
+  const data = await response.json().catch(() => ({}));
+  if (typeof data?.error === "string" && data.error) return data.error;
+  if (typeof data?.message === "string" && data.message) return data.message;
+  return fallback;
+}
 var BookingService = class {
-  /**
-   * 创建新预订
-   * 
-   * @param data 预订数据
-   * @returns 创建的预订信息
-   */
   static async createBooking(data) {
     return createBooking(data);
   }
-  /**
-   * 获取预订列表
-   * 
-   * @param params 查询参数
-   * @returns 预订列表和分页信息
-   */
   static async getBookings(params = {}) {
     return getBookings(params);
   }
-  /**
-   * 获取单个预订详情
-   * 
-   * @param id 预订ID
-   * @returns 预订详情
-   */
-  static async getBooking(id) {
-    const response = await fetch(`${this.BASE_URL}/${id}`);
+  static async getBooking(id, credentials) {
+    const url = appendBookingCredentials(`${this.BASE_URL}/${id}`, credentials);
+    const response = await fetch(url);
     if (!response.ok) {
-      const error = await response.json().catch(() => ({ message: "\u83B7\u53D6\u9884\u8BA2\u8BE6\u60C5\u5931\u8D25" }));
-      throw new Error(error.message || "\u83B7\u53D6\u9884\u8BA2\u8BE6\u60C5\u5931\u8D25");
+      throw new Error(await parseErrorMessage(response, "\u83B7\u53D6\u9884\u8BA2\u8BE6\u60C5\u5931\u8D25"));
     }
     return response.json();
   }
-  /**
-   * 更新预订状态
-   * 
-   * @param id 预订ID
-   * @param data 更新数据
-   * @returns 更新后的预订信息
-   */
   static async updateBooking(id, data) {
     const response = await fetch(`${this.BASE_URL}/${id}`, {
       method: "PUT",
@@ -1565,30 +1565,25 @@ var BookingService = class {
       body: JSON.stringify(data)
     });
     if (!response.ok) {
-      const error = await response.json().catch(() => ({ message: "\u66F4\u65B0\u9884\u8BA2\u5931\u8D25" }));
-      throw new Error(error.message || "\u66F4\u65B0\u9884\u8BA2\u5931\u8D25");
+      throw new Error(await parseErrorMessage(response, "\u66F4\u65B0\u9884\u8BA2\u5931\u8D25"));
     }
     return response.json();
   }
   /**
-   * 删除预订
-   * 
-   * @param id 预订ID
+   * 删除预订（须携带与下单一致的 QQ + 手机号，与 profile-v1 API 约定一致）
    */
-  static async deleteBooking(id) {
-    const response = await fetch(`${this.BASE_URL}/${id}`, {
-      method: "DELETE"
+  static async deleteBooking(id, credentials) {
+    const url = appendBookingCredentials(`${this.BASE_URL}/${id}`, credentials);
+    const body = bookingCredentialsBody(credentials);
+    const response = await fetch(url, {
+      method: "DELETE",
+      headers: body ? { "Content-Type": "application/json" } : void 0,
+      body
     });
     if (!response.ok) {
-      const error = await response.json().catch(() => ({ message: "\u5220\u9664\u9884\u8BA2\u5931\u8D25" }));
-      throw new Error(error.message || "\u5220\u9664\u9884\u8BA2\u5931\u8D25");
+      throw new Error(await parseErrorMessage(response, "\u5220\u9664\u9884\u8BA2\u5931\u8D25"));
     }
   }
-  /**
-   * 获取可预订的画集列表
-   * 
-   * @returns 画集简略信息列表
-   */
   static async getBookableCollections() {
     return getBookableCollections();
   }
@@ -11021,7 +11016,7 @@ var CartHistoryPage = ({
   const handleDeleteBooking = async (bookingId) => {
     if (confirm("\u786E\u5B9A\u8981\u5220\u9664\u8FD9\u6761\u9884\u8BA2\u8BB0\u5F55\u5417\uFF1F\u6B64\u64CD\u4F5C\u4E0D\u53EF\u64A4\u9500\u3002")) {
       try {
-        await BookingService.deleteBooking(bookingId);
+        await BookingService.deleteBooking(bookingId, { qqNumber, phoneNumber });
         console.log("\u9884\u8BA2\u8BB0\u5F55\u5220\u9664\u6210\u529F");
         await loadBookings();
       } catch (error2) {