sa2kit 1.6.113 → 1.6.114

package/dist/index.mjs

@@ -7934,46 +7934,46 @@ __export(bookingService_exports, {
   getBookings: () => getBookings2,
   updateBooking: () => updateBooking
 });
+function appendBookingCredentials(path4, credentials) {
+  if (!credentials?.qqNumber?.trim() || !credentials?.phoneNumber?.trim()) {
+    return path4;
+  }
+  const params = new URLSearchParams({
+    qqNumber: credentials.qqNumber.trim(),
+    phoneNumber: credentials.phoneNumber.trim()
+  });
+  return `${path4}?${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(id2) {
-    const response = await fetch(`${this.BASE_URL}/${id2}`);
+  static async getBooking(id2, credentials) {
+    const url = appendBookingCredentials(`${this.BASE_URL}/${id2}`, 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(id2, data) {
     const response = await fetch(`${this.BASE_URL}/${id2}`, {
       method: "PUT",
@@ -7983,53 +7983,36 @@ 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(id2) {
-    const response = await fetch(`${this.BASE_URL}/${id2}`, {
-      method: "DELETE"
+  static async deleteBooking(id2, credentials) {
+    const url = appendBookingCredentials(`${this.BASE_URL}/${id2}`, 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();
   }
 };
 BookingService.BASE_URL = "/api/showmasterpiece/bookings";
-var createBooking2 = (data) => {
-  return BookingService.createBooking(data);
-};
-var getBookings2 = (params) => {
-  return BookingService.getBookings(params);
-};
-var getBooking = (id2) => {
-  return BookingService.getBooking(id2);
-};
-var updateBooking = (id2, data) => {
-  return BookingService.updateBooking(id2, data);
-};
-var deleteBooking = (id2) => {
-  return BookingService.deleteBooking(id2);
-};
-var getBookableCollections2 = () => {
-  return BookingService.getBookableCollections();
-};
+var createBooking2 = (data) => BookingService.createBooking(data);
+var getBookings2 = (params) => BookingService.getBookings(params);
+var getBooking = (id2, credentials) => BookingService.getBooking(id2, credentials);
+var updateBooking = (id2, data) => BookingService.updateBooking(id2, data);
+var deleteBooking = (id2, credentials) => BookingService.deleteBooking(id2, credentials);
+var getBookableCollections2 = () => BookingService.getBookableCollections();
 
 // src/business/showmasterpiece/logic/hooks/useBooking.ts
 function useBooking(_props = {}) {
@@ -12422,10 +12405,10 @@ var BookingQueryService = class {
       conditions.push(eq(comicUniverseBookings.collectionId, input.collectionId));
     }
     if (input.qqNumber) {
-      conditions.push(like(comicUniverseBookings.qqNumber, `%${input.qqNumber}%`));
+      conditions.push(eq(comicUniverseBookings.qqNumber, input.qqNumber.trim()));
     }
     if (input.phoneNumber) {
-      conditions.push(like(comicUniverseBookings.phoneNumber, `%${input.phoneNumber}%`));
+      conditions.push(eq(comicUniverseBookings.phoneNumber, input.phoneNumber.trim()));
     }
     if (input.status) {
       conditions.push(eq(comicUniverseBookings.status, input.status));
@@ -19325,7 +19308,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) {
@@ -20387,8 +20370,8 @@ var HistoryMiniappPage = ({ apiBaseUrl = DEFAULT_BASE_URL }) => {
       return;
     }
     setPrivacyConsented(true);
-    if (!qqNumber.trim() && !phoneNumber.trim()) {
-      Taro2.showToast({ title: "\u8BF7\u8F93\u5165QQ\u53F7\u6216\u8054\u7CFB\u65B9\u5F0F", icon: "none" });
+    if (!qqNumber.trim() || !phoneNumber.trim()) {
+      Taro2.showToast({ title: "\u8BF7\u540C\u65F6\u586B\u5199QQ\u53F7\u4E0E\u8054\u7CFB\u65B9\u5F0F", icon: "none" });
       return;
     }
     setLoading(true);
@@ -20397,8 +20380,8 @@ var HistoryMiniappPage = ({ apiBaseUrl = DEFAULT_BASE_URL }) => {
     try {
       const result = await getBookings3(
         {
-          qqNumber: qqNumber.trim() || void 0,
-          phoneNumber: phoneNumber.trim() || void 0,
+          qqNumber: qqNumber.trim(),
+          phoneNumber: phoneNumber.trim(),
           page: 1,
           limit: 50
         },
@@ -20427,7 +20410,7 @@ var HistoryMiniappPage = ({ apiBaseUrl = DEFAULT_BASE_URL }) => {
       completedCount
     };
   }, [records]);
-  return /* @__PURE__ */ React53__default.createElement(View, { className: "min-h-screen bg-gradient-to-br from-white to-prussian-blue-100 pb-12 text-rich-black" }, /* @__PURE__ */ React53__default.createElement(PageHeader_default, { title: "\u5386\u53F2\u8BB0\u5F55\u67E5\u8BE2", subtitle: "\u8F93\u5165 QQ \u6216\u8054\u7CFB\u65B9\u5F0F\u67E5\u8BE2\u9884\u8BA2\u8BB0\u5F55" }), /* @__PURE__ */ React53__default.createElement(View, { className: "mx-4 mt-5 rounded-3xl border border-prussian-blue-200 bg-white px-5 py-5 shadow-sm" }, /* @__PURE__ */ React53__default.createElement(
+  return /* @__PURE__ */ React53__default.createElement(View, { className: "min-h-screen bg-gradient-to-br from-white to-prussian-blue-100 pb-12 text-rich-black" }, /* @__PURE__ */ React53__default.createElement(PageHeader_default, { title: "\u5386\u53F2\u8BB0\u5F55\u67E5\u8BE2", subtitle: "\u8BF7\u540C\u65F6\u586B\u5199 QQ \u53F7\u4E0E\u8054\u7CFB\u65B9\u5F0F\u67E5\u8BE2\u9884\u8BA2\u8BB0\u5F55" }), /* @__PURE__ */ React53__default.createElement(View, { className: "mx-4 mt-5 rounded-3xl border border-prussian-blue-200 bg-white px-5 py-5 shadow-sm" }, /* @__PURE__ */ React53__default.createElement(
     FormInput,
     {
       label: "QQ\u53F7",