@pisell/private-materials 6.6.70 → 6.6.71

package/lib/components/booking/info2/service/editService/index.js

@@ -64,6 +64,7 @@ var import_utils9 = require("../../../info/service2/Group/utils");
 var import_useShopDiscountModule = require("../../../../ticketBooking/hooks/pisellos/useShopDiscountModule");
 var import_DiscountChangeModal = __toESM(require("./DiscountChangeModal"));
 var import_decimal = __toESM(require("decimal.js"));
+var import_useEngineContext = __toESM(require("../../../../../hooks/useEngineContext"));
 var submitLock = false;
 var Info = (_, ref) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K;
@@ -79,6 +80,7 @@ var Info = (_, ref) => {
   const useEndDate = import_antd.Form.useWatch("end_date", form);
   const shopDiscount = (0, import_useShopDiscountModule.useShopDiscountModule)();
   const [discountChangeModalOpen, setDiscountChangeModalOpen] = (0, import_react.useState)(false);
+  const context = (0, import_useEngineContext.default)();
   const { state, dispatch } = (0, import_react.useContext)(import_model.Context);
   const resourcesRef = (0, import_react.useRef)(null);
   const isChangeTotal = (0, import_react.useRef)(false);
@@ -500,17 +502,23 @@ var Info = (_, ref) => {
     return ((_d2 = (_c2 = (_b2 = (_a2 = state.service) == null ? void 0 : _a2.cacheItem) == null ? void 0 : _b2._extend) == null ? void 0 : _c2.other) == null ? void 0 : _d2.bundle) || [];
   }, [(_o = (_n = (_m = (_l = state.service) == null ? void 0 : _l.cacheItem) == null ? void 0 : _m._extend) == null ? void 0 : _n.other) == null ? void 0 : _o.bundle]);
   const handleEdit = (0, import_ahooks.useMemoizedFn)((e) => {
-    var _a2, _b2, _c2, _d2, _e2;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
     const item = state.service.cacheItem;
     let values = form.getFieldsValue();
     const isSession = (0, import_utils6.isSessionProduct)(item);
     const sessionValue = {};
+    let oldSession = {};
     if (isSession) {
       sessionValue.startEndTime = {
         startDate: (_a2 = item == null ? void 0 : item._extend) == null ? void 0 : _a2.start_date,
         endDate: (_b2 = item == null ? void 0 : item._extend) == null ? void 0 : _b2.end_date,
         duration: (_c2 = item == null ? void 0 : item._extend) == null ? void 0 : _c2.duration
       };
+      oldSession = {
+        start_date: (0, import_dayjs.default)((_d2 = item == null ? void 0 : item._extend) == null ? void 0 : _d2.start_date).format("YYYY-MM-DD"),
+        end_date: (0, import_dayjs.default)((_e2 = item == null ? void 0 : item._extend) == null ? void 0 : _e2.end_date).format("YYYY-MM-DD"),
+        duration: (_f2 = item == null ? void 0 : item._extend) == null ? void 0 : _f2.duration
+      };
     }
     state.action({
       type: "pisell1.handleOpenProductModal",
@@ -525,15 +533,16 @@ var Info = (_, ref) => {
           number: (0, import_utils3.getIsShowNumber)(item, state)
         },
         isOS: isSession,
-        customer_id: (_e2 = (_d2 = state.client) == null ? void 0 : _d2.value) == null ? void 0 : _e2.id,
+        customer_id: (_h2 = (_g2 = state.client) == null ? void 0 : _g2.value) == null ? void 0 : _h2.id,
         value: {
           ...item._extend.other,
+          bundle: (0, import_utils8.mergeBundles)(item._extend.other),
           ...sessionValue,
           quantity: values.quantity || item._extend.quantity
         }
       },
       callback: (e2, extension_type, detail) => {
-        var _a3, _b3, _c3, _d3, _e3, _f2, _g2;
+        var _a3, _b3, _c3, _d3, _e3, _f3, _g3, _h3, _i2, _j2, _k2, _l2, _m2, _n2, _o2, _p2, _q2, _r2, _s2;
         isEditedRef.current = true;
         const _detail = detail || item;
         let other = JSON.parse(JSON.stringify(e2));
@@ -570,6 +579,29 @@ var Info = (_, ref) => {
         } catch (err) {
         }
         const sessionDetail = (0, import_utils5.editSessionProduct)(cacheItem, e2.session);
+        try {
+          (0, import_utils.sendWarningLog)({
+            title: "修改商品数据",
+            content: [
+              { key: "productId", value: item.id },
+              { key: "isSession", value: isSession },
+              { key: "oldSession", value: JSON.stringify(oldSession) },
+              { key: "sessionValue", value: JSON.stringify({
+                startTime: (_d3 = e2.session) == null ? void 0 : _d3.start_time,
+                endTime: (_e3 = e2.session) == null ? void 0 : _e3.end_time,
+                startDate: (0, import_dayjs.default)((_f3 = e2.session) == null ? void 0 : _f3.start_at).format("YYYY-MM-DD"),
+                endDate: (0, import_dayjs.default)((_g3 = e2.session) == null ? void 0 : _g3.end_at).format("YYYY-MM-DD"),
+                duration: (_h3 = e2.session) == null ? void 0 : _h3.duration
+              }) },
+              { key: "日期", value: (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm") },
+              {
+                key: "店铺id",
+                value: (_o2 = (_n2 = (_m2 = (_l2 = (_k2 = (_j2 = (_i2 = context.appHelper) == null ? void 0 : _i2.utils) == null ? void 0 : _j2.store) == null ? void 0 : _k2.getState) == null ? void 0 : _l2.call(_k2)) == null ? void 0 : _m2.global) == null ? void 0 : _n2.globalConfig) == null ? void 0 : _o2.id
+              }
+            ]
+          });
+        } catch (err) {
+        }
         if (sessionDetail) {
           setTimeout(() => {
             form.setFieldsValue({
@@ -581,8 +613,8 @@ var Info = (_, ref) => {
         let origin_total = _total;
         if (item.discount_amount) {
           origin_total = (0, import_utils6.getProductOriginTotalPrice)(cacheItem);
-          const previousOriginTotal = Number(((_d3 = item == null ? void 0 : item._extend) == null ? void 0 : _d3.origin_total) || 0);
-          const previousTotal = Number(((_e3 = item == null ? void 0 : item._extend) == null ? void 0 : _e3.total) || 0);
+          const previousOriginTotal = Number(((_p2 = item == null ? void 0 : item._extend) == null ? void 0 : _p2.origin_total) || 0);
+          const previousTotal = Number(((_q2 = item == null ? void 0 : item._extend) == null ? void 0 : _q2.total) || 0);
           const productAllDiscountList = (0, import_utils8.getProductAllDiscountList)(item);
           const hasNonManualDiscount = productAllDiscountList.some(
             (discountItem) => (discountItem == null ? void 0 : discountItem.type) !== "product"
@@ -594,7 +626,7 @@ var Info = (_, ref) => {
           }
         }
         cacheItem._extend.origin_total = origin_total;
-        (((_f2 = cacheItem._extend) == null ? void 0 : _f2.items) || []).forEach((item2) => item2._extend.origin_total = origin_total);
+        (((_r2 = cacheItem._extend) == null ? void 0 : _r2.items) || []).forEach((item2) => item2._extend.origin_total = origin_total);
         dispatch({
           type: "setService",
           payload: {
@@ -603,7 +635,7 @@ var Info = (_, ref) => {
         });
         form.setFieldsValue({
           total: _total,
-          capacity: (_g2 = cacheItem._extend) == null ? void 0 : _g2.capacity,
+          capacity: (_s2 = cacheItem._extend) == null ? void 0 : _s2.capacity,
           quantity: (e2 == null ? void 0 : e2.quantity) || (values == null ? void 0 : values.quantity) || 1
         });
       }

package/lib/components/booking/info2/service/editService/utils.d.ts

@@ -32,6 +32,7 @@ export declare const setProductPrice: (cacheItem: any, { newTotal, origin_total
  * @returns 折扣列表
  */
 export declare const getProductAllDiscountList: (cacheItem: any) => any;
+export declare const mergeBundles: (other: any) => any[];
 /**
  * 合并 bundle 数据，基于 id 和 product_id 匹配，price 优先使用 originalOther 中的值
  * @param other - callback 返回的新数据

package/lib/components/booking/info2/service/editService/utils.js

@@ -32,6 +32,7 @@ __export(utils_exports, {
   getAutoAllocationStorage: () => getAutoAllocationStorage,
   getProductAllDiscountList: () => getProductAllDiscountList,
   mergeBundleWithOriginalPrice: () => mergeBundleWithOriginalPrice,
+  mergeBundles: () => mergeBundles,
   setAutoAllocationStorage: () => setAutoAllocationStorage,
   setProductPrice: () => setProductPrice
 });
@@ -96,6 +97,20 @@ var getProductAllDiscountList = (cacheItem) => {
   discountList.push(...bundleDiscountList);
   return discountList;
 };
+var mergeBundles = (other) => {
+  const bundle = (other == null ? void 0 : other.bundle) || [];
+  const newBundle = [];
+  bundle.forEach((item) => {
+    const newItem = newBundle.find((newItem2) => newItem2.id === item.id);
+    if (newItem) {
+      newItem.num += item.num || 1;
+      newItem.quantity += item.quantity || 1;
+    } else {
+      newBundle.push({ ...item });
+    }
+  });
+  return newBundle;
+};
 var mergeBundleWithOriginalPrice = (other, originalOther) => {
   var _a, _b;
   if (!((_a = other == null ? void 0 : other.bundle) == null ? void 0 : _a.length) || !((_b = originalOther == null ? void 0 : originalOther.bundle) == null ? void 0 : _b.length)) return other;
@@ -115,6 +130,7 @@ var mergeBundleWithOriginalPrice = (other, originalOther) => {
   getAutoAllocationStorage,
   getProductAllDiscountList,
   mergeBundleWithOriginalPrice,
+  mergeBundles,
   setAutoAllocationStorage,
   setProductPrice
 });

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

@@ -1,4 +1,4 @@
 import React from 'react';
 import '../../info/service/index.less';
-declare const _default: React.MemoExoticComponent<() => JSX.Element>;
+declare const _default: React.MemoExoticComponent<() => React.JSX.Element>;
 export default _default;

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

@@ -1,3 +1,4 @@
+import React from 'react';
 import './index.less';
-declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => JSX.Element;
+declare const ServiceItem: ({ d, handleEditService, state, handleLike, errorMessage, handleDeleteService, }: any) => React.JSX.Element;
 export default ServiceItem;

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

@@ -1,5 +1,6 @@
+import React from 'react';
 import './index.less';
 declare const ServiceList: ({ onEdit }: {
     onEdit: any;
-}) => JSX.Element;
+}) => React.JSX.Element;
 export default ServiceList;

package/lib/components/booking/materiels/contacts/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
 declare type ContactType = {
     country_calling_code: string;
@@ -11,5 +12,5 @@ declare type ContactsPropsType = {
     value: ContactType[];
     onChange: (value: ContactType[]) => void;
 };
-declare const Contacts: (props: ContactsPropsType) => JSX.Element;
+declare const Contacts: (props: ContactsPropsType) => React.JSX.Element;
 export default Contacts;

package/lib/components/booking/materiels/duration/index.d.ts

@@ -1,4 +1,5 @@
 import { SelectProps } from 'antd';
+import React from 'react';
 interface DurationProps extends SelectProps {
     locale?: string;
     slice?: number;
@@ -9,5 +10,5 @@ interface DurationProps extends SelectProps {
     startDate?: any;
     timeObj?: any;
 }
-declare const Duration: (props: DurationProps) => JSX.Element;
+declare const Duration: (props: DurationProps) => React.JSX.Element;
 export default Duration;

package/lib/components/booking/materiels/holder/index.d.ts

@@ -1,6 +1,7 @@
 import { SelectProps } from 'antd';
+import React from 'react';
 interface HolderProps extends SelectProps {
     selectProps?: SelectProps;
 }
-declare const Holder: (props: HolderProps) => JSX.Element;
+declare const Holder: (props: HolderProps) => React.JSX.Element;
 export default Holder;

package/lib/components/booking/materiels/startTime/index.d.ts

@@ -1,9 +1,10 @@
 import { SelectProps } from "antd";
+import React from "react";
 interface StartTimeProps extends SelectProps {
     locale?: string;
     slice?: number;
     selectProps?: SelectProps;
     timeObjChange?: any;
 }
-declare const StartTime: (props: StartTimeProps) => JSX.Element;
+declare const StartTime: (props: StartTimeProps) => React.JSX.Element;
 export default StartTime;

package/lib/components/booking/model.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 export interface FormState {
     amountSymbol: string;
     apis: {
@@ -110,11 +109,4 @@ export declare const walkInData: {
     id: number;
     nickname: string;
 };
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/notes/NoteBlock/NoteItem/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
 export interface InfoProps {
     isEdit: boolean;
@@ -5,5 +6,5 @@ export interface InfoProps {
     onChange?: (item: any, type: "edit" | "remove") => void;
     menus?: any[];
 }
-declare const NoteItem: (props: InfoProps) => JSX.Element;
+declare const NoteItem: (props: InfoProps) => React.JSX.Element;
 export default NoteItem;

package/lib/components/booking/notes/NoteBlock/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
 export interface InfoProps {
     title?: string;
@@ -12,5 +13,5 @@ export interface InfoProps {
     maxLength?: number;
     noteType: string;
 }
-declare const NoteBlock: (props: InfoProps) => JSX.Element;
+declare const NoteBlock: (props: InfoProps) => React.JSX.Element;
 export default NoteBlock;

package/lib/components/booking/notes/addNote/index.d.ts

@@ -1,3 +1,4 @@
+import React from "react";
 import "./index.less";
-declare const AddNote: ({ value, onChange, title, placeholder }: any) => JSX.Element;
+declare const AddNote: ({ value, onChange, title, placeholder }: any) => React.JSX.Element;
 export default AddNote;

package/lib/components/booking/notes/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

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

@@ -134,7 +134,7 @@ var Payments = (0, import_model.Provider)((props) => {
           item.service_fee,
           2,
           (state == null ? void 0 : state.amountSymbol) || "$"
-        ), ")") : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-list-item-date" }, (0, import_dayjs.default)(item.payment_time).format(
+        ), ")") : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "payment-list-item-date" }, (0, import_dayjs.default)(item.payment_time || item.created_at).format(
           "HH:mm YYYY/MM/DD"
         ), /* @__PURE__ */ import_react.default.createElement("span", { className: "payment-list-item-platform-type" }, item.platform && import_utils.locales.getText("pisell2.text.platform.type")(
           item.platform

package/lib/components/booking/payments/model.d.ts

@@ -1,10 +1 @@
-/// <reference types="react" />
-import { FormState } from "../model";
-export declare const Provider: (ComponentUi: any) => any, Context: import("react").Context<{
-    state: FormState;
-} & {
-    dispatch: (params: {
-        type: string;
-        payload: any;
-    }) => void;
-}>;
+export declare const Provider: any, Context: any;

package/lib/components/booking/utils/holderAssignmentConfirmModal.d.ts

@@ -0,0 +1,7 @@
+import React from 'react';
+import './confirmHolderModal.less';
+export declare const HolderAssignmentConfirmModal: React.FC;
+/**
+ * 通过 await 调起保存前 holder 分配确认弹窗。
+ */
+export declare function showHolderAssignmentConfirmModal(state: any): Promise<boolean>;