@pisell/private-materials 3.3.33 → 3.3.35

package/lib/components/appointmentBooking/hooks.d.ts

@@ -75,6 +75,7 @@ export declare const useAppointmentBookingResource: () => {
         resources: any;
         resourceCodes: any;
     };
+    autoSelectAllProductResources: (index?: number) => Promise<any>;
 };
 /**
  * @title: 是否跳过资源选择步骤
@@ -84,7 +85,7 @@ export declare const useAppointmentBookingResource: () => {
  * @Date: 2025-04-21 11:47
  */
 export declare const useIsSkipResourceStep: () => {
-    checkSkipResourceStep: () => Promise<boolean>;
+    checkSkipResourceStep: (isSkipUpdateFormStep?: boolean) => Promise<boolean>;
 };
 /**
  * @title: 获取预约配置
@@ -96,6 +97,7 @@ export declare const useIsSkipResourceStep: () => {
 export declare const useAppointmentBookingSetting: () => {
     isDateSelectedFirst: boolean;
     isFormSubject: boolean;
+    isRetailTemplate: any;
     customPageId: any;
     channel: any;
     bookingSubject: any;

package/lib/components/appointmentBooking/hooks.js

@@ -48,7 +48,7 @@ var import_useEngineContext = require("../../hooks/useEngineContext");
 var import_useEngineContext2 = __toESM(require("../../hooks/useEngineContext"));
 var import_utils2 = require("./utils");
 var import_context = require("./context");
-var import_utils3 = require("./components/Resource/utils");
+var import_utils3 = require("./components/Cart/utils");
 var useAppointmentBooking = () => {
   const pisellOS = (0, import_useEngineContext.usePisellOS)();
   return pisellOS.getModule("appointmentBooking");
@@ -66,13 +66,9 @@ var contextUtils = () => {
 var useAppointmentBookingStep = () => {
   var _a, _b, _c;
   const pisellOS = (0, import_useEngineContext.usePisellOS)();
-  const { appointmentBooking, setCurrentStep, carts, openPolicy, setCarts, setLoading, currentSelectedResourcesRef, currentStepParams, setIsErrorHolder } = (0, import_context.useAppointmentBookingContext)();
+  const { appointmentBooking, setCurrentStep, policyIdsRef, openPolicy } = (0, import_context.useAppointmentBookingContext)();
+  const { isRetailTemplate } = useAppointmentBookingSetting();
   const stepList = ((_c = (_b = (_a = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a.step) == null ? void 0 : _b.store) == null ? void 0 : _c.stepList) || [];
-  const { isLogin, openLoginModal } = useAppointmentBookingLogin();
-  const { isFormSubject } = useAppointmentBookingSetting();
-  const { accountLists, getHolders, checkAccount } = useAppointmentBookingAccount();
-  const { getResourceList } = useAppointmentBookingResource();
-  const utils = contextUtils();
   const getCurrentAndLastStep = () => {
     const currentStep = appointmentBooking == null ? void 0 : appointmentBooking.getCurrentStep();
     setCurrentStep(currentStep);
@@ -119,103 +115,27 @@ var useAppointmentBookingStep = () => {
     });
   };
   const nextStep = () => {
-    var _a2, _b2, _c2, _d, _e, _f, _g, _h;
-    let stepList2 = (currentStepParams == null ? void 0 : currentStepParams.stepLists) || [];
-    const currentKey = currentStepParams == null ? void 0 : currentStepParams.key;
-    if (currentKey == null ? void 0 : currentKey.startsWith("select-resource")) {
-      const { hasError, updatedCartList } = (0, import_utils2.checkAndMarkCartRenderError)((currentSelectedResourcesRef == null ? void 0 : currentSelectedResourcesRef.current) || [], appointmentBooking, utils);
-      if (hasError) {
-        (0, import_utils3.scrollToFirstErrorCard)();
-        return;
-      }
-      (_a2 = currentSelectedResourcesRef == null ? void 0 : currentSelectedResourcesRef.current) == null ? void 0 : _a2.forEach((cart) => {
-        var _a3, _b3;
-        const selectedResource2 = cart == null ? void 0 : cart.currentSelectedResource;
-        const resourceItem = (selectedResource2 == null ? void 0 : selectedResource2.resourceItem) || {};
-        const formId = (_a3 = selectedResource2 == null ? void 0 : selectedResource2.renderItem) == null ? void 0 : _a3.resource_form_id;
-        const policyId = (_b3 = selectedResource2 == null ? void 0 : selectedResource2.renderItem) == null ? void 0 : _b3.policy_id;
-        const formKey = `fill-form_@${resourceItem == null ? void 0 : resourceItem.form_id}-${resourceItem == null ? void 0 : resourceItem.code}-${cart == null ? void 0 : cart._id}-${formId}-${policyId}`;
-        if (formId) {
-          const description = import_utils.locales.getText("pisell2.appointment.fill-form");
-          const beforeKey = (0, import_utils2.getFormInsertBeforeKey)(currentKey, stepList2);
-          appointmentBooking.addStep({ key: formKey, description }, beforeKey);
-        } else {
-          appointmentBooking.removeStep(formKey);
-        }
-      });
-      const selectedResource = (_c2 = (_b2 = currentSelectedResourcesRef == null ? void 0 : currentSelectedResourcesRef.current) == null ? void 0 : _b2[0]) == null ? void 0 : _c2.currentSelectedResource;
-      if (selectedResource) {
-        const originRenderLists = ((_d = selectedResource == null ? void 0 : selectedResource.resourceItem) == null ? void 0 : _d.originRenderLists) || [];
-        const currentResourceIndex = originRenderLists == null ? void 0 : originRenderLists.findIndex((item) => {
-          var _a3;
-          return item.id === ((_a3 = selectedResource == null ? void 0 : selectedResource.renderItem) == null ? void 0 : _a3.form_id);
-        });
-        const nextResource = originRenderLists == null ? void 0 : originRenderLists[currentResourceIndex + 1];
-        const resourceKey = `select-resource_@${nextResource == null ? void 0 : nextResource.form_id}-${nextResource == null ? void 0 : nextResource.code}`;
-        if (nextResource) {
-          const beforeKey = (_e = stepList2[stepList2.length - 2]) == null ? void 0 : _e.key;
-          appointmentBooking.addStep({ key: resourceKey, description: "" }, beforeKey);
-        } else {
-          appointmentBooking.removeStep(resourceKey);
-        }
-      }
+    var _a2, _b2, _c2, _d;
+    if (isRetailTemplate) {
+      return appointmentBooking.next();
     }
-    const nextStep2 = stepList2[(currentStepParams == null ? void 0 : currentStepParams.index) + 1];
-    if (((_f = nextStep2 == null ? void 0 : nextStep2.key) == null ? void 0 : _f.startsWith("select-resource_")) || (nextStep2 == null ? void 0 : nextStep2.key) === "confirm-information") {
-      const selectedResource = (_h = (_g = currentSelectedResourcesRef.current) == null ? void 0 : _g[0]) == null ? void 0 : _h.currentSelectedResource;
-      const renderItem = (selectedResource == null ? void 0 : selectedResource.renderItem) || {};
-      const checkHolder = () => {
-        setLoading(false);
-        const { hasError, updatedCartList } = (0, import_utils2.checkAndGoNext)(isFormSubject, checkAccount, carts);
-        if (hasError) {
-          setIsErrorHolder(hasError);
-          setCarts(updatedCartList);
-          return;
-        }
-        if (!!(renderItem == null ? void 0 : renderItem.policy_id)) {
-          openPolicy({ id: renderItem == null ? void 0 : renderItem.policy_id }, () => {
-            return appointmentBooking.next();
-          });
-        } else {
-          return appointmentBooking.next();
-        }
-      };
-      const checkLogin = () => {
-        if (!isLogin) {
-          return openLoginModal({
-            callback: (status) => {
-              var _a3;
-              if (status === "success") {
-                if (!isFormSubject) {
-                  const user = JSON.parse(((_a3 = utils == null ? void 0 : utils.storage) == null ? void 0 : _a3.get("customer")) || "{}");
-                  const currentUser = (0, import_utils2.formatCustomer)(user);
-                  const meAccount = accountLists == null ? void 0 : accountLists.find((d) => !(d == null ? void 0 : d.isGuest));
-                  appointmentBooking.setLoginAccount(meAccount == null ? void 0 : meAccount.id, currentUser);
-                } else {
-                  getHolders();
-                }
-                checkHolder();
-              }
-            }
-          });
-        } else {
-          return checkHolder();
-        }
-      };
-      if ((nextStep2 == null ? void 0 : nextStep2.key) !== "confirm-information") {
-        if (!(renderItem == null ? void 0 : renderItem.policy_id)) {
-          return appointmentBooking.next();
-        }
-        return openPolicy({ id: renderItem == null ? void 0 : renderItem.policy_id }, () => {
-          const cartItem = carts == null ? void 0 : carts[0];
-          appointmentBooking.updateCart({
-            _id: cartItem == null ? void 0 : cartItem._id,
-            ...cartItem
-          });
-          appointmentBooking.next();
-        });
-      } else {
-        return checkLogin();
+    const currentStep = appointmentBooking == null ? void 0 : appointmentBooking.getCurrentStep();
+    const stepList2 = ((_c2 = (_b2 = (_a2 = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a2.step) == null ? void 0 : _b2.store) == null ? void 0 : _c2.stepList) || [];
+    if ((currentStep == null ? void 0 : currentStep.index) + 2 === (stepList2 == null ? void 0 : stepList2.length)) {
+      if ((_d = policyIdsRef == null ? void 0 : policyIdsRef.current) == null ? void 0 : _d.length) {
+        let idx = 0;
+        const showNextPolicy = () => {
+          if (idx < policyIdsRef.current.length) {
+            openPolicy({ id: policyIdsRef.current[idx] }, () => {
+              idx++;
+              showNextPolicy();
+            });
+          } else {
+            appointmentBooking.next();
+          }
+        };
+        showNextPolicy();
+        return;
       }
     }
     appointmentBooking.next();
@@ -254,29 +174,14 @@ var useAppointmentBookingCart = () => {
   var _a;
   const pisellOS = (0, import_useEngineContext.usePisellOS)();
   const utils = contextUtils();
-  const { appointmentBooking, isErrorHolder, setCarts, setSummary, setIsAgreeDepositPolicy } = (0, import_context.useAppointmentBookingContext)();
+  const { appointmentBooking, setCarts, setSummary, setIsAgreeDepositPolicy } = (0, import_context.useAppointmentBookingContext)();
   const { bookingSubject } = ((_a = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _a.productModuleParams) || {};
   const getCartAndSummary = async () => {
-    var _a2;
-    const locale = ((_a2 = utils == null ? void 0 : utils.storage) == null ? void 0 : _a2.get("umi_locale")) || "en-US";
-    const symbol = (utils == null ? void 0 : utils.getSymbolic()) || "$";
     const carts = await appointmentBooking.getCart();
-    const accountLists = await appointmentBooking.getAccounts();
     const newCarts = carts == null ? void 0 : carts.map((item) => {
-      var _a3;
       return {
         ...item,
-        addHolderButtonText: utils == null ? void 0 : utils.translation(bookingSubject == null ? void 0 : bookingSubject.form_name),
-        format: ["HH:mm", "HH:mm"],
-        show_time: true,
-        duration_type: ((_a3 = item == null ? void 0 : item.duration) == null ? void 0 : _a3.type) || "minutes",
-        locale,
-        symbol,
-        holders: (0, import_utils2.formatHolder)(accountLists),
-        allowClearHolder: true,
-        allowClearResource: true,
-        isErrorHolder: isErrorHolder || false,
-        isMultipleResource: true
+        addHolderButtonText: utils == null ? void 0 : utils.translation(bookingSubject == null ? void 0 : bookingSubject.form_name)
       };
     });
     setCarts(newCarts || []);
@@ -369,7 +274,7 @@ var useAppointmentBookingAccount = () => {
   return { accountLists, getHolders, form_id, addAccount, checkAccount };
 };
 var useAppointmentBookingResource = () => {
-  const { appointmentBooking, setResources, setTimes } = (0, import_context.useAppointmentBookingContext)();
+  const { appointmentBooking, setResources, setTimes, setResourceOtherParams, resourceOtherParams } = (0, import_context.useAppointmentBookingContext)();
   const { resourceSort } = (appointmentBooking == null ? void 0 : appointmentBooking.otherParams) || {};
   const getResourceList = () => {
     var _a;
@@ -391,47 +296,60 @@ var useAppointmentBookingResource = () => {
     const data = await appointmentBooking.getTimeSlotByAllResources(code);
     setTimes(data || []);
   };
-  return { getResourceTimeSlot, getResourceList };
+  const autoSelectAllProductResources = async (index) => {
+    const { resourceCodes } = getResourceList();
+    const code = resourceCodes == null ? void 0 : resourceCodes[index || 0];
+    const data = await appointmentBooking.getTimeSlotByAllResources(code);
+    let res = await appointmentBooking.autoSelectAllProductResources(code);
+    setResourceOtherParams({
+      ...resourceOtherParams,
+      ...res,
+      resourceCodes
+    });
+    return res;
+  };
+  return { getResourceTimeSlot, getResourceList, autoSelectAllProductResources };
 };
 var useIsSkipResourceStep = () => {
-  const { currentStepParams } = (0, import_context.useAppointmentBookingContext)();
-  const { getResourceList } = useAppointmentBookingResource();
+  var _a, _b, _c;
+  const { currentStep, setCarts, setPolicyIds } = (0, import_context.useAppointmentBookingContext)();
+  const { getResourceList, autoSelectAllProductResources } = useAppointmentBookingResource();
   const { isFormSubject } = useAppointmentBookingSetting();
   const appointmentBooking = useAppointmentBooking();
+  const stepList = ((_c = (_b = (_a = appointmentBooking == null ? void 0 : appointmentBooking.store) == null ? void 0 : _a.step) == null ? void 0 : _b.store) == null ? void 0 : _c.stepList) || [];
+  const { isLogin, openLoginModal } = useAppointmentBookingLogin();
+  const { getHolders, checkAccount } = useAppointmentBookingAccount();
   const { nextStep } = useAppointmentBookingStep();
-  const checkSkipResourceStep = async () => {
+  const utils = contextUtils();
+  const checkSkipResourceStep = async (isSkipUpdateFormStep) => {
+    var _a2, _b2, _c2, _d, _e;
     try {
-      const { resources } = getResourceList();
       const accountLists = await appointmentBooking.getAccounts();
-      const { isSystem, isSkip, form_code } = (0, import_utils2.currentAppointmentBoard)(currentStepParams.key, resources, appointmentBooking);
-      if (isSystem) {
-        nextStep();
-        return true;
-      }
+      const carts = await appointmentBooking.getCart();
       if ((accountLists == null ? void 0 : accountLists.length) === 1 || isFormSubject) {
-        const renderLists = (0, import_utils2.currentRenderLists)(resources, form_code);
-        let _isSkip = false;
-        if ((renderLists == null ? void 0 : renderLists.length) === 1) {
-          _isSkip = isSkip || false;
-        } else {
-          _isSkip = false;
-        }
-        if (_isSkip) {
-          nextStep();
+        const res = await autoSelectAllProductResources();
+        const { resources } = getResourceList();
+        if (!((_a2 = res == null ? void 0 : res.errorList) == null ? void 0 : _a2.length) && ((_e = (_d = (_c2 = (_b2 = resources == null ? void 0 : resources[0]) == null ? void 0 : _b2.resources) == null ? void 0 : _c2[0]) == null ? void 0 : _d.renderList) == null ? void 0 : _e.length) === 1) {
+          if (!isSkipUpdateFormStep) {
+            const resultCarts = (0, import_utils2.formatCartsResources)(carts, resources, setPolicyIds);
+            (0, import_utils2.checkHasFormStep)({ nextStep, isSkip: true, openLoginModal, utils, accountLists, getHolders, checkHolder: import_utils3.checkHolder, setCarts, checkAccount, carts, isFormSubject, hasResourceFormId: (resultCarts == null ? void 0 : resultCarts.length) > 0, currentStep, stepList, appointmentBooking, locales: import_utils.locales, isLogin });
+          }
           return true;
+        } else {
+          return false;
         }
-        return _isSkip;
       } else {
         return false;
       }
     } catch (error) {
+      console.log(error, "checkSkipResourceStep33");
       return false;
     }
   };
   return { checkSkipResourceStep };
 };
 var useAppointmentBookingSetting = () => {
-  var _a;
+  var _a, _b;
   const utils = contextUtils();
   const { appointmentBooking } = (0, import_context.useAppointmentBookingContext)();
   const { bookingProcess, bookingSubject, customPageId, channel } = ((_a = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _a.productModuleParams) || {};
@@ -449,6 +367,8 @@ var useAppointmentBookingSetting = () => {
     isDateSelectedFirst: bookingProcess === "date_first",
     // 主体是否是表单
     isFormSubject: (bookingSubject == null ? void 0 : bookingSubject.type) === "form",
+    // 是否是零售模版
+    isRetailTemplate: ((_b = appointmentBooking == null ? void 0 : appointmentBooking.otherParams) == null ? void 0 : _b.isRetailTemplate) || false,
     customPageId,
     channel,
     bookingSubject,

package/lib/components/appointmentBooking/utils.d.ts

@@ -101,7 +101,7 @@ export declare function updateLists<T extends Record<string, any>>(list: T[], ke
  * @Author: WangHan
  * @Date: 2025-04-27 17:27
  */
-export declare const updateBookingFormStorage: (bookingForm: any, id: number | string, newData: any) => any;
+export declare const updateBookingFormStorage: (bookingForm: any, id: number, newData: any) => any;
 export declare const Toast: (text: string) => void;
 /**
  * @title: 添加或移除表单步骤
@@ -111,90 +111,4 @@ export declare const Toast: (text: string) => void;
  * @Author: WangHan
  * @Date: 2025-05-06 21:51
  */
-export declare const checkHasFormStep: ({ nextStep, isSkip, checkHolder, checkAccount, carts, setCarts, hasResourceFormId, currentStep, stepList, appointmentBooking, locales, isLogin, openLoginModal, isFormSubject, utils, accountLists, getHolders }: any) => void;
-export declare const getCartCurrentResourceData: (cart: any, currentKey: any, resources: any[]) => any;
-/**
- * @title: 获取购物车资源列表
- * @description:
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-05-25 13:56
- */
-export declare const getMultiResources: (cart: any, resourceItem: any, currentKey: string) => any[];
-export declare const getCurrentBoard: (appointmentBooking: any, code: string) => any;
-/**
- * @title:
- * @description: 根据资源code获取资源标题
- * @param {any} appointmentBooking
- * @param {string} code
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-05-24 18:51
- */
-export declare const getResourceTitle: (appointmentBooking: any, code: string, utils: any, originResource: any) => string;
-/**
- * @title: 监测购物车中是否有没有选择资源的
- * @description:
- * @param {any} carts
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-05-24 18:47
- */
-export declare const checkAndMarkCartRenderError: (carts: any, appointmentBooking?: any, utils?: any) => {
-    hasError: boolean;
-    updatedCartList: any;
-};
-/**
- * @title: 查表表单步骤插入到哪个步骤的后面的key
- * @description:
- * @param {string} currentKey
- * @param {any} stepList
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-05-24 19:05
- */
-export declare const getFormInsertBeforeKey: (currentKey: string, stepList: any[]) => any;
-/**
- * @title: 监测holder数据
- * @description:
- * @param {any} isFormSubject
- * @param {any} checkAccount
- * @param {any} carts
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-05-24 22:46
- */
-export declare const checkAndGoNext: (isFormSubject: any, checkAccount: any, carts: any[]) => {
-    hasError: boolean;
-    updatedCartList: any[];
-};
-export declare const currentAppointmentBoard: (currentKey: string, resources: any[], appointmentBooking: any) => {
-    isRequired: boolean;
-    isSystem: boolean;
-    isSkip: boolean;
-    form_id: number;
-    form_code: any;
-    cart_id: string;
-    resource_form_id: string;
-    policy_id: string;
-} | {
-    isRequired?: undefined;
-    isSystem?: undefined;
-    isSkip?: undefined;
-    form_id?: undefined;
-    form_code?: undefined;
-    cart_id?: undefined;
-    resource_form_id?: undefined;
-    policy_id?: undefined;
-};
-export declare const currentRenderLists: (resources: any[], code: any) => any;
-/**
- * @title: 更新购物车
- * @description:
- * @param {any} carts
- * @param {any} value
- * @return {*}
- * @Author: WangHan
- * @Date: 2025-05-25 23:17
- */
-export declare const updateCartResources: (item: any, value: any) => any;
+export declare const checkHasFormStep: ({ nextStep, isSkip, checkHolder, checkAccount, carts, setCarts, hasResourceFormId, currentStep, stepList, appointmentBooking, locales, isLogin, openLoginModal, isFormSubject, utils, accountLists, getHolders }: any) => true | undefined;