@pisell/private-materials 3.3.56 → 3.3.57

package/es/components/booking/components/footer/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

package/es/components/booking/components/footer/index.js

@@ -517,7 +517,7 @@ var Footer = function Footer(props) {
             }
           case 32:
             // 回调关闭弹窗
-            state === null || state === void 0 || state.callback(callbackData);
+            state === null || state === void 0 || state.callback(callbackData, type);
             _setLoading(false);
 
             // return数据  checkout时需要

package/es/components/booking/info/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

package/es/components/booking/info/service/addTimeModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

package/es/components/booking/info2/service/addTimeModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../../../info/service/addTimeModal/index.less';
 declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

package/es/components/ticketBooking/components/ticketBooking/index.js

@@ -20,7 +20,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useEffect, useRef } from 'react';
 import { locales } from '@pisell/utils';
 import { message } from 'antd';
-import { getOrderInfoByCode, getBookingDetail, getEventBookingDetail, getBookingConfig, getServices } from "../../serve";
+import { getOrderInfoByCode, getBookingDetail, getEventBookingDetail, getBookingConfig, getServices, voidAppointment } from "../../serve";
 import * as apis from "../../serve";
 import dayjs from 'dayjs';
 import useEngineContext from "../../../../hooks/useEngineContext";
@@ -52,7 +52,7 @@ var TicketBooking = function TicketBooking() {
   var _timerRef = useRef();
   var _callbackFnRef = useRef();
   useEffect(function () {
-    var _interaction$utils, _store$getState, _interaction$utils2;
+    var _interaction$utils, _store$getState, _interaction$utils2, _interaction$utils3;
     _persistentRef.current = storage.get("drawer-booking") === 'true' ? true : isTerminal();
     if (lowcodeRef) {
       lowcodeRef.onReady(_this);
@@ -80,10 +80,14 @@ var TicketBooking = function TicketBooking() {
     _setShopOpeningHours();
     _setIntervalTime(true);
     interaction === null || interaction === void 0 || (_interaction$utils2 = interaction.utils) === null || _interaction$utils2 === void 0 || _interaction$utils2.mountFunction('booking', 'refreshBookingDetail', function (type, orderId) {
-      console.log(type, orderId, 'type, orderId');
-      if (state.bookingId) {
-        _getBookingDetail();
-      }
+      // console.log(type, orderId, 'type, orderId');
+      // 支付成功后清空状态
+      _initFn(function () {});
+    });
+
+    // 作废预约
+    interaction === null || interaction === void 0 || (_interaction$utils3 = interaction.utils) === null || _interaction$utils3 === void 0 || _interaction$utils3.mountFunction('booking', 'voidBooking', function (orderId) {
+      voidAppointment(orderId);
     });
     return function () {
       off === null || off === void 0 || off();
@@ -696,8 +700,11 @@ var TicketBooking = function TicketBooking() {
   };
 
   // 新建完成之后的回调
-  var _callback = function _callback(data) {
-    console.log('callbackcallback');
+  var _callback = function _callback(data, type) {
+    // 结账时
+    if (isTerminal() && type === 'checkout') {
+      return;
+    }
     setState({
       createCount: state.createCount + 1
     });

package/es/components/ticketBooking/serve.d.ts

@@ -280,3 +280,8 @@ export declare const getOrderInfoByCode: (params: any) => Promise<any>;
  * @Date: 2025-04-24 16:28
  */
 export declare const getClientsEs: (params: any) => Promise<any>;
+/**
+ * 作废2.0预约订单
+ * @param order_id
+ */
+export declare const voidAppointment: (order_id: number) => Promise<any>;

package/es/components/ticketBooking/serve.js

@@ -960,4 +960,31 @@ export var getClientsEs = /*#__PURE__*/function () {
   return function getClientsEs(_x42) {
     return _ref30.apply(this, arguments);
   };
+}();
+
+/**
+ * 作废2.0预约订单
+ * @param order_id
+ */
+export var voidAppointment = /*#__PURE__*/function () {
+  var _ref31 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee31(order_id) {
+    var _yield$request$getReq30, data;
+    return _regeneratorRuntime().wrap(function _callee31$(_context31) {
+      while (1) switch (_context31.prev = _context31.next) {
+        case 0:
+          _context31.next = 2;
+          return request.getRequest().put(prefix + "/order/void/appointment/".concat(order_id), {});
+        case 2:
+          _yield$request$getReq30 = _context31.sent;
+          data = _yield$request$getReq30.data;
+          return _context31.abrupt("return", data);
+        case 5:
+        case "end":
+          return _context31.stop();
+      }
+    }, _callee31);
+  }));
+  return function voidAppointment(_x43) {
+    return _ref31.apply(this, arguments);
+  };
 }();

package/lib/components/booking/components/footer/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 /**
  * @title: 底部

package/lib/components/booking/components/footer/index.js

@@ -301,7 +301,7 @@ var Footer = (props) => {
           );
         }
       }
-      state == null ? void 0 : state.callback(callbackData);
+      state == null ? void 0 : state.callback(callbackData, type);
       _setLoading(false);
       return callbackData || values;
     } catch (err) {

package/lib/components/booking/info/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { InfoProps } from './main';
 declare const APP: (props: InfoProps) => JSX.Element;
 export default APP;

package/lib/components/booking/info/service/addTimeModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import './index.less';
 declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

package/lib/components/booking/info2/service/addTimeModal/index.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import '../../../info/service/addTimeModal/index.less';
 declare const AddTimeModal: () => JSX.Element;
 export default AddTimeModal;

package/lib/components/ticketBooking/components/ticketBooking/index.js

@@ -57,7 +57,7 @@ var TicketBooking = () => {
   const _timerRef = (0, import_react.useRef)();
   const _callbackFnRef = (0, import_react.useRef)();
   (0, import_react.useEffect)(() => {
-    var _a2, _b, _c, _d, _e;
+    var _a2, _b, _c, _d, _e, _f;
     _persistentRef.current = storage.get(`drawer-booking`) === "true" ? true : isTerminal();
     if (lowcodeRef) {
       lowcodeRef.onReady(void 0);
@@ -95,10 +95,15 @@ var TicketBooking = () => {
       "booking",
       "refreshBookingDetail",
       (type, orderId) => {
-        console.log(type, orderId, "type, orderId");
-        if (state.bookingId) {
-          _getBookingDetail();
-        }
+        _initFn(() => {
+        });
+      }
+    );
+    (_f = interaction == null ? void 0 : interaction.utils) == null ? void 0 : _f.mountFunction(
+      "booking",
+      "voidBooking",
+      (orderId) => {
+        (0, import_serve.voidAppointment)(orderId);
       }
     );
     return () => {
@@ -645,8 +650,10 @@ var TicketBooking = () => {
       }
     );
   };
-  const _callback = (data) => {
-    console.log("callbackcallback");
+  const _callback = (data, type) => {
+    if (isTerminal() && type === "checkout") {
+      return;
+    }
     setState({
       createCount: state.createCount + 1
     });

package/lib/components/ticketBooking/serve.d.ts

@@ -280,3 +280,8 @@ export declare const getOrderInfoByCode: (params: any) => Promise<any>;
  * @Date: 2025-04-24 16:28
  */
 export declare const getClientsEs: (params: any) => Promise<any>;
+/**
+ * 作废2.0预约订单
+ * @param order_id
+ */
+export declare const voidAppointment: (order_id: number) => Promise<any>;

package/lib/components/ticketBooking/serve.js

@@ -48,7 +48,8 @@ __export(serve_exports, {
   getServices: () => getServices,
   removeNoteByOrder: () => removeNoteByOrder,
   saveAddonsByOrderId: () => saveAddonsByOrderId,
-  saveBookingFormData: () => saveBookingFormData
+  saveBookingFormData: () => saveBookingFormData,
+  voidAppointment: () => voidAppointment
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("./../../utils");
@@ -183,6 +184,10 @@ var getClientsEs = async (params) => {
   let { data } = await import_utils.request.getRequest().get(prefix + "/customer/es/data", params);
   return data;
 };
+var voidAppointment = async (order_id) => {
+  let { data } = await import_utils.request.getRequest().put(prefix + `/order/void/appointment/${order_id}`, {});
+  return data;
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   addNotesByOrder,
@@ -214,5 +219,6 @@ var getClientsEs = async (params) => {
   getServices,
   removeNoteByOrder,
   saveAddonsByOrderId,
-  saveBookingFormData
+  saveBookingFormData,
+  voidAppointment
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "3.3.56",
+  "version": "3.3.57",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -59,10 +59,10 @@
     "react-infinite-scroll-component": "^6.1.0",
     "rc-virtual-list": "^3.11.3",
     "decimal.js": "^10.4.3",
-    "@pisell/materials": "3.3.22",
+    "@pisell/icon": "0.0.11",
     "@pisell/utils": "1.0.42",
-    "@pisell/date-picker": "3.0.2",
-    "@pisell/icon": "0.0.11"
+    "@pisell/materials": "3.3.22",
+    "@pisell/date-picker": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",