@pisell/pisellos 0.0.127 → 0.0.129

package/lib/solution/BookingByStep/index.js

@@ -69,6 +69,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     if (!this.request) {
       throw new Error("bookingByStep解决方案需要 request 插件支持");
     }
+    if (!this.shopStore) {
+      throw new Error("SummaryModule 需要 shopStore 插件支持");
+    }
     let targetCacheData = {};
     this.cacheId = (_a = this.otherParams) == null ? void 0 : _a.cacheId;
     if ((_b = this.otherParams) == null ? void 0 : _b.cacheId) {
@@ -821,7 +824,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
     const arr = [];
     cartItems.forEach((cartItem) => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d, _e, _f, _g, _h;
       let selectedResources = [];
       const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
         capacity: (_a = cartItem._productOrigin) == null ? void 0 : _a.capacity,
@@ -858,9 +861,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         const resourcesUseableMap = {};
         productResources.forEach((n) => {
           n.renderList = n.renderList.sort((a, b) => {
-            var _a2, _b2, _c2, _d;
+            var _a2, _b2, _c2, _d2;
             const aIsCombined = ((_b2 = (_a2 = a.metadata) == null ? void 0 : _a2.combined_resource) == null ? void 0 : _b2.status) === 1;
-            const bIsCombined = ((_d = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d.status) === 1;
+            const bIsCombined = ((_d2 = (_c2 = b.metadata) == null ? void 0 : _c2.combined_resource) == null ? void 0 : _d2.status) === 1;
             if (aIsCombined && !bIsCombined)
               return 1;
             if (!aIsCombined && bIsCombined)
@@ -900,17 +903,22 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           });
         });
       } else {
+        const hasFlexibleDuration = ((_e = (_d = cartItem._productOrigin) == null ? void 0 : _d.duration) == null ? void 0 : _e.type) === "flexible";
+        const operating_day_boundary = (_h = (_g = (_f = this.shopStore.get("core")) == null ? void 0 : _f.core) == null ? void 0 : _g.operating_day_boundary) == null ? void 0 : _h.time;
         productResources.forEach((item) => {
           item.renderList = item.renderList.filter((n) => {
-            var _a2, _b2;
+            var _a2, _b2, _c2;
             const recordCount = n.capacity || 0;
             if (n.onlyComputed)
               return false;
             const timeSlots = (0, import_resources.getTimeSlicesByResource)({
               resource: n,
-              duration: ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 0,
+              duration: ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 10,
               split: 10,
-              currentDate: dateRange[0].date
+              currentDate: dateRange[0].date,
+              hasFlexibleDuration,
+              cut_off_time: (_c2 = cartItem._productOrigin) == null ? void 0 : _c2.cut_off_time,
+              operating_day_boundary
             });
             return recordCount >= currentCapacity && timeSlots.length > 0;
           });
@@ -1037,7 +1045,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               return false;
             const timeSlots = (0, import_resources.getTimeSlicesByResource)({
               resource: n,
-              duration: ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 0,
+              duration: ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 10,
               split: 10,
               currentDate: dateRange[0].date
             });
@@ -1155,7 +1163,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     }
     let duration = accountCartItems.reduce((acc, n) => {
       var _a2, _b2;
-      return acc + (((_b2 = (_a2 = n._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) ?? 0);
+      return acc + (((_b2 = (_a2 = n._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 10);
     }, 0);
     let AllResources = [];
     if (dateRange == null ? void 0 : dateRange.length) {
@@ -1287,7 +1295,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const selectForCartResources = (cartItems2) => {
       let recordTimeSlots = (0, import_lodash_es.cloneDeep)(timeSlots);
       cartItems2.forEach((item, index) => {
-        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q;
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
         const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
           capacity: (_a2 = item._productOrigin) == null ? void 0 : _a2.capacity,
           product_bundle: item._origin.product.product_bundle
@@ -1308,12 +1316,12 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           const resourceBookingType = (currentResourceConfig == null ? void 0 : currentResourceConfig.type) || "single";
           if (index !== 0 && recordTimeSlots && resourceBookingType === "single" && ((_e = item._productOrigin) == null ? void 0 : _e.duration)) {
             let start_at = (0, import_dayjs.default)(recordTimeSlots.end_time).add(
-              ((_g = (_f = item._productOrigin) == null ? void 0 : _f.duration) == null ? void 0 : _g.value) ?? 0,
-              ((_i = (_h = item._productOrigin) == null ? void 0 : _h.duration) == null ? void 0 : _i.type) ?? "minutes"
+              ((_g = (_f = item._productOrigin) == null ? void 0 : _f.duration) == null ? void 0 : _g.value) || 10,
+              "minutes"
             );
             let end_at = start_at.add(
-              ((_k = (_j = item._productOrigin) == null ? void 0 : _j.duration) == null ? void 0 : _k.value) ?? 0,
-              ((_m = (_l = item._productOrigin) == null ? void 0 : _l.duration) == null ? void 0 : _m.type) ?? "minutes"
+              ((_i = (_h = item._productOrigin) == null ? void 0 : _h.duration) == null ? void 0 : _i.value) || 10,
+              "minutes"
             );
             recordTimeSlots = {
               start_time: start_at.format("HH:mm"),
@@ -1366,7 +1374,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           const allCartItems = (0, import_lodash_es.cloneDeep)(this.store.cart.getItems());
           let selectedResources = [];
           const resources2 = (0, import_lodash_es.cloneDeep)(
-            ((_o = (_n = item._productOrigin) == null ? void 0 : _n.product_resource) == null ? void 0 : _o.resources) || []
+            ((_k = (_j = item._productOrigin) == null ? void 0 : _j.product_resource) == null ? void 0 : _k.resources) || []
           );
           const currentResourcesRenderList = [];
           resources2.forEach((n) => {
@@ -1377,7 +1385,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 const recordCount = (m.capacity || 0) - (selectResourcesMap[m.id] || 0);
                 const timeSlots2 = (0, import_resources.getTimeSlicesByResource)({
                   resource: m,
-                  duration: ((_a4 = item == null ? void 0 : item.duration) == null ? void 0 : _a4.value) || 0,
+                  duration: ((_a4 = item == null ? void 0 : item.duration) == null ? void 0 : _a4.value) || 10,
                   split: 10,
                   currentDate: dateRange[0].date
                 });
@@ -1414,11 +1422,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
               return recordCount >= currentCapacity;
             });
           });
-          const targetRenderList = (_p = productResources.find(
+          const targetRenderList = (_l = productResources.find(
             (n) => n.code === resources_code
-          )) == null ? void 0 : _p.renderList;
+          )) == null ? void 0 : _l.renderList;
           if (targetRenderList && targetRenderList.length > 0) {
-            if ((_q = item._origin.resources) == null ? void 0 : _q.some(
+            if ((_m = item._origin.resources) == null ? void 0 : _m.some(
               (n) => n.form_id === targetRenderList[0].form_id
             )) {
               return;
@@ -1464,7 +1472,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 从购物车中获取已经分配好第一步资源的所有时间片
   getTimeSlotByAllResources(resources_code) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
     let dateRange = this.store.date.getDateRange();
     const resources = [];
     const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
@@ -1474,7 +1482,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     let maxCutOffTime = void 0;
     let maxCutOffTimeValue = (0, import_dayjs.default)();
     cartItems.forEach((item) => {
-      var _a2, _b2, _c2, _d2, _e2, _f2, _g, _h, _i;
+      var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2;
       (_c2 = (_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.product_resource) == null ? void 0 : _b2.resources) == null ? void 0 : _c2.forEach((n) => {
         if (n.code === resources_code) {
           resources.push(...n.renderList || []);
@@ -1484,10 +1492,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       if (item.resource_id) {
         resourceIds.push(item.resource_id);
       }
-      resourcesTypeId = (_g = (_f2 = (_e2 = (_d2 = item == null ? void 0 : item._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e2.resources) == null ? void 0 : _f2.find(
+      resourcesTypeId = (_g2 = (_f2 = (_e2 = (_d2 = item == null ? void 0 : item._productOrigin) == null ? void 0 : _d2.product_resource) == null ? void 0 : _e2.resources) == null ? void 0 : _f2.find(
         (n) => n.code === resources_code
-      )) == null ? void 0 : _g.id;
-      if (((_h = item._productOrigin) == null ? void 0 : _h.cut_off_time) && ((_i = item._productOrigin) == null ? void 0 : _i.cut_off_time.type) === "advance") {
+      )) == null ? void 0 : _g2.id;
+      if (((_h2 = item._productOrigin) == null ? void 0 : _h2.cut_off_time) && ((_i2 = item._productOrigin) == null ? void 0 : _i2.cut_off_time.type) === "advance") {
         const currentCutOffTime = (0, import_dayjs.default)().add(
           item._productOrigin.cut_off_time.unit,
           item._productOrigin.cut_off_time.unit_type
@@ -1513,10 +1521,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       cartItems2.forEach((item) => {
         var _a2, _b2, _c2, _d2, _e2, _f2;
         if (isSingleResource) {
-          accountDuration += ((_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) ?? 0;
+          accountDuration += ((_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 10;
         } else {
-          if (accountDuration < (((_d2 = (_c2 = item._productOrigin) == null ? void 0 : _c2.duration) == null ? void 0 : _d2.value) ?? 0)) {
-            accountDuration = ((_f2 = (_e2 = item._productOrigin) == null ? void 0 : _e2.duration) == null ? void 0 : _f2.value) ?? 0;
+          if (accountDuration < (((_d2 = (_c2 = item._productOrigin) == null ? void 0 : _c2.duration) == null ? void 0 : _d2.value) || 10)) {
+            accountDuration = ((_f2 = (_e2 = item._productOrigin) == null ? void 0 : _e2.duration) == null ? void 0 : _f2.value) || 10;
           }
         }
       });
@@ -1552,6 +1560,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       ];
     }
     const resourcesUseableMap = {};
+    const hasFlexibleDuration = cartItems.some((item) => {
+      var _a2, _b2;
+      return ((_b2 = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.type) === "flexible";
+    });
+    const operating_day_boundary = (_i = (_h = (_g = this.shopStore.get("core")) == null ? void 0 : _g.core) == null ? void 0 : _h.operating_day_boundary) == null ? void 0 : _i.time;
     const timeSlots = (0, import_resources.getTimeSlicesByResources)({
       resourceIds,
       resourcesMap,
@@ -1559,13 +1572,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       currentDate: dateRange[0].date,
       split: 10,
       resourcesUseableMap,
-      cut_off_time: maxCutOffTime
+      cut_off_time: maxCutOffTime,
+      hasFlexibleDuration,
+      operating_day_boundary
     });
     return timeSlots;
   }
-  // 提交时间切片，绑定到对应购物车的商品上，更新购物车
+  // 提交时间切片，绑定到对应购物车的商品上，更新购物车---只有 duration 商品
   submitTimeSlot(timeSlots) {
+    var _a, _b, _c;
     const cartItems = this.store.cart.getItems().filter((n) => !(0, import_utils4.isNormalProduct)(n._productOrigin));
+    const allResources = this.store.date.getResourcesListByDate(timeSlots.start_at.format("YYYY-MM-DD"));
     const itemsByAccount = cartItems.reduce(
       (acc, item) => {
         const holderId = item.holder_id;
@@ -1577,25 +1594,46 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       },
       {}
     );
+    const operating_day_boundary = (_c = (_b = (_a = this.shopStore.get("core")) == null ? void 0 : _a.core) == null ? void 0 : _b.operating_day_boundary) == null ? void 0 : _c.time;
     Object.values(itemsByAccount).forEach((accountItems) => {
       let currentStartTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
       accountItems.forEach((item, index) => {
-        var _a;
+        var _a2;
         const newResources = (0, import_lodash_es.cloneDeep)(item._origin.resources);
         newResources.forEach((resource) => {
-          var _a2, _b, _c, _d;
-          resource.startTime = currentStartTime;
-          resource.endTime = (0, import_dayjs.default)(currentStartTime).add(
-            ((_b = (_a2 = item._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b.value) ?? 0,
-            ((_d = (_c = item._productOrigin) == null ? void 0 : _c.duration) == null ? void 0 : _d.type) ?? "minutes"
-          ).format("YYYY-MM-DD HH:mm");
-          delete resource.times;
+          var _a3, _b2, _c2, _d, _e;
+          if (((_b2 = (_a3 = item._productOrigin) == null ? void 0 : _a3.duration) == null ? void 0 : _b2.type) === "flexible") {
+            item.duration = {
+              type: "minutes",
+              value: 10
+            };
+            resource.startTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
+            const targetResourceTimes = (_c2 = allResources == null ? void 0 : allResources.find((n) => n.id === resource.id)) == null ? void 0 : _c2.times;
+            const resourcesEndTime = targetResourceTimes.reduce((acc, curr) => {
+              return (0, import_dayjs.default)(curr.end_at).isBefore((0, import_dayjs.default)(acc.end_at)) ? curr : acc;
+            }, targetResourceTimes[0]);
+            const endTime = (0, import_dayjs.default)(resourcesEndTime.end_at).isBefore((0, import_dayjs.default)(operating_day_boundary)) ? resourcesEndTime.end_at : operating_day_boundary;
+            let formattedEndTime;
+            if (typeof endTime === "string" && endTime.includes(":") && !endTime.includes(" ") && !endTime.includes("T")) {
+              const currentDate = timeSlots.start_at.format("YYYY-MM-DD");
+              formattedEndTime = (0, import_dayjs.default)(`${currentDate} ${endTime}`);
+            } else {
+              formattedEndTime = (0, import_dayjs.default)(endTime);
+            }
+            resource.endTime = formattedEndTime.format("YYYY-MM-DD HH:mm");
+          } else {
+            resource.startTime = currentStartTime;
+            resource.endTime = (0, import_dayjs.default)(currentStartTime).add(
+              ((_e = (_d = item._productOrigin) == null ? void 0 : _d.duration) == null ? void 0 : _e.value) || 10,
+              "minutes"
+            ).format("YYYY-MM-DD HH:mm");
+          }
         });
         this.store.cart.updateItem({
           _id: item._id,
           resources: newResources
         });
-        if (index < accountItems.length - 1 && ((_a = newResources == null ? void 0 : newResources[0]) == null ? void 0 : _a.resourceType) === "single") {
+        if (index < accountItems.length - 1 && ((_a2 = newResources == null ? void 0 : newResources[0]) == null ? void 0 : _a2.resourceType) === "single") {
           currentStartTime = newResources[0].endTime;
         }
       });
@@ -1758,7 +1796,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     account
   }) {
     const { bundle, options, origin, product_variant_id, rowKey, quantity = 1 } = product || {};
-    const productData = { ...origin, product_variant_id };
+    const productData = { ...origin, product_variant_id, rowKey };
     if (!account) {
       const activeAccount = this.getActiveAccount();
       if (activeAccount) {
@@ -1777,7 +1815,10 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           product: {
             ...targetCartItem._productOrigin,
             quantity: (targetCartItem.num || 1) + quantity
-          }
+          },
+          bundle: targetCartItem._bundleOrigin,
+          options: targetCartItem._optionsOrigin,
+          quantity: (targetCartItem.num || 1) + quantity
         });
         return;
       }
@@ -1940,7 +1981,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           return false;
         const timeSlots = (0, import_resources.getTimeSlicesByResource)({
           resource: n,
-          duration: ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 0,
+          duration: ((_b2 = (_a2 = cartItem._productOrigin) == null ? void 0 : _a2.duration) == null ? void 0 : _b2.value) || 10,
           split: 10,
           currentDate: dateRange[0].date
         });
@@ -2038,11 +2079,16 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
       startDate = (0, import_dayjs.default)().format("YYYY-MM-DD");
     }
     const endDateAfterMonth = (0, import_dayjs.default)().add(1, "month").format("YYYY-MM-DD");
+    let tempEndDate = endDateAfterMonth;
     if ((0, import_dayjs.default)(startDate).add(7, "day").isAfter((0, import_dayjs.default)(endDateAfterMonth), "day")) {
-      endDate = (0, import_dayjs.default)(startDate).add(7, "day").format("YYYY-MM-DD");
+      tempEndDate = (0, import_dayjs.default)(startDate).add(7, "day").format("YYYY-MM-DD");
     } else {
-      endDate = endDateAfterMonth;
+      tempEndDate = endDateAfterMonth;
+    }
+    if ((0, import_dayjs.default)(tempEndDate).isBefore((0, import_dayjs.default)(endDate), "day")) {
+      tempEndDate = endDate || "";
     }
+    endDate = tempEndDate;
     let tempProducts;
     tempProducts = (_a = this.store.currentProduct) == null ? void 0 : _a.getData();
     const schedule = (_b = this.store.currentProduct) == null ? void 0 : _b.getOtherParams()["schedule"];

package/lib/solution/BookingByStep/utils/resources.d.ts

@@ -79,7 +79,7 @@ export declare const formatResources: ({ booking, resources, }: {
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time, }: {
+export declare const getTimeSlicesByResource: ({ resource, duration, split, currentDate, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary }: {
     resource: ResourceItem;
     duration: number;
     split: number;
@@ -96,6 +96,8 @@ export declare const getTimeSlicesByResource: ({ resource, duration, split, curr
             unit: number;
         } | undefined;
     } | undefined;
+    hasFlexibleDuration?: boolean | undefined;
+    operating_day_boundary?: string | undefined;
 }) => TimeSliceItem[];
 /**
  * @title: 获取时间切片列表的交集
@@ -133,7 +135,7 @@ export declare const mergeSubResourcesTimeSlices: (resources: ResourceItem[], re
  * @return {*}
  * @Author: zhiwei.Wang
  */
-export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time, }: {
+export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, duration, currentDate, split, capacity, resourcesUseableMap, cut_off_time, hasFlexibleDuration, operating_day_boundary }: {
     resourceIds: number[];
     resourcesMap: any;
     duration: number;
@@ -151,6 +153,8 @@ export declare const getTimeSlicesByResources: ({ resourceIds, resourcesMap, dur
             unit: number;
         } | undefined;
     } | undefined;
+    hasFlexibleDuration?: boolean | undefined;
+    operating_day_boundary?: string | undefined;
 }) => any[];
 /**
  * @title: 获取其他人的已选资源

package/lib/solution/BookingByStep/utils/resources.js

@@ -333,12 +333,13 @@ var getTimeSlicesByResource = ({
   currentDate = (0, import_dayjs.default)(),
   capacity,
   resourcesUseableMap = {},
-  cut_off_time
+  cut_off_time,
+  hasFlexibleDuration,
+  operating_day_boundary
 }) => {
   const { times } = resource;
   const timeSlices = [];
   times.forEach((time) => {
-    const today = (0, import_dayjs.default)(currentDate).format("YYYY-MM-DD");
     const startTime = (0, import_dayjs.default)(`${time.start_at}`);
     const endTime = (0, import_dayjs.default)(`${time.end_at}`);
     let currentStart = startTime;
@@ -365,6 +366,9 @@ var getTimeSlicesByResource = ({
         resourcesUseableMap[resource.id] = _status.usable;
       }
       if (_status.usable) {
+        if (hasFlexibleDuration && operating_day_boundary && timeSlice.start_time >= operating_day_boundary) {
+          break;
+        }
         timeSlices.push({
           ...timeSlice,
           // 这里需要补充这个时间段内是否可预约
@@ -422,7 +426,9 @@ var getTimeSlicesByResources = ({
   split,
   capacity,
   resourcesUseableMap,
-  cut_off_time
+  cut_off_time,
+  hasFlexibleDuration,
+  operating_day_boundary
 }) => {
   let resources = getResourcesByIds(resourcesMap, resourceIds);
   mergeSubResourcesTimeSlices(resources, resourcesMap);
@@ -446,7 +452,9 @@ var getTimeSlicesByResources = ({
           currentDate,
           capacity,
           resourcesUseableMap,
-          cut_off_time
+          cut_off_time,
+          hasFlexibleDuration,
+          operating_day_boundary
         })
       );
     },

package/lib/solution/ShopDiscount/index.js

@@ -118,7 +118,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         this.loadPrepareConfig({
           customerId: customer.id,
           action: "create",
-          with_good_pass: 1
+          with_good_pass: 1,
+          with_discount_card: 1
         });
       }
     );
@@ -303,11 +304,11 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   // 获取客户钱包信息
   async getCustomerWallet(id) {
     try {
-      const result = await this.request.get(`/customer/info/wallet/${id}`, {
-        wallet_pass_tags: ["good_pass"]
+      const result = await this.request.get(`/customer/info/${id}`, {
+        with_trashed: 1
       });
       if (result == null ? void 0 : result.data) {
-        const { wallet_pass_list, ...customer } = result.data;
+        const { ...customer } = result.data;
         this.setCustomer(customer);
         await this.core.effects.emit(
           import_types.ShopDiscountHooks.onScanCustomerChange,
@@ -326,7 +327,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       const goodPassList = await ((_b = this.store.discount) == null ? void 0 : _b.loadPrepareConfig({
         customer_id: customerId,
         action: "create",
-        with_good_pass: 1
+        with_good_pass: 1,
+        with_discount_card: 1
       }));
       const scanDiscount = (_c = this.getDiscountList()) == null ? void 0 : _c.filter(
         (item) => item.isScan

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "@pisell/pisellos",
-  "version": "0.0.127",
+  "version": "0.0.129",
   "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",