@pisell/pisellos 0.0.51 → 0.0.53

package/dist/modules/Cart/types.d.ts

@@ -173,7 +173,7 @@ export interface IUpdateItemParams {
     /** 关联表单 */
     relationForms?: {
         /** 关联表单ID */
-        form_id: number[];
+        form_id: number;
         /** 关联表单记录ID */
         form_record_ids: number[];
     }[];

package/dist/modules/Cart/utils.d.ts

@@ -98,14 +98,14 @@ export declare const formatResourceToCartItemOrigin: (params: {
 export declare const formatRelationFormsToCartItem: (params: {
     cartItem: CartItem;
     relationForms: {
-        form_id: number[];
+        form_id: number;
         form_record_ids: number[];
     }[];
 }) => CartItem;
 export declare const formatRelationFormsToCartItemOrigin: (params: {
     cartItem: CartItem;
     relationForms: {
-        form_id: number[];
+        form_id: number;
         form_record_ids: number[];
     }[];
 }) => any;
@@ -230,8 +230,8 @@ export declare const handleProductDeposit: (params: {
     total: string | number;
     num: number;
 }) => {
-    depositTotal: Decimal;
     result: boolean;
+    depositTotal: Decimal;
 };
 /**
  * 从购物车中删除资源相关信息

package/dist/modules/Cart/utils.js

@@ -598,8 +598,15 @@ export var handleProductDeposit = function handleProductDeposit(params) {
   var depositData = params.depositData,
     total = params.total,
     num = params.num;
-  var deposit_fixed = depositData.deposit_fixed,
-    deposit_percentage = depositData.deposit_percentage;
+  if (!depositData) {
+    return {
+      result: false,
+      depositTotal: new Decimal(0)
+    };
+  }
+  var _ref3 = depositData || {},
+    deposit_fixed = _ref3.deposit_fixed,
+    deposit_percentage = _ref3.deposit_percentage;
   if (typeof deposit_fixed === 'string' && typeof deposit_percentage === 'string') {
     var depositFixed = Decimal(deposit_fixed || 0);
     var depositPercent = Decimal(deposit_percentage || 0);
@@ -625,21 +632,12 @@ export var deleteResourceFromCartItem = function deleteResourceFromCartItem(cart
   // 删除UI层的数据
   cartItem.resource_id = undefined;
   cartItem.relation_form_name = undefined;
-  cartItem.start_date = undefined;
-  cartItem.start_time = undefined;
-  cartItem.end_date = undefined;
-  cartItem.end_time = undefined;
 
   // 删除资源原始数据
   delete cartItem._resourceOrigin;
 
   // 删除原始数据
   cartItem._origin.resources = null;
-  cartItem._origin.select_date = null;
-  cartItem._origin.start_date = null;
-  cartItem._origin.start_time = null;
-  cartItem._origin.end_date = null;
-  cartItem._origin.end_time = null;
   return cartItem;
 };
 

package/dist/solution/BookingByStep/index.js

@@ -1311,11 +1311,9 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       var accountCartItems = cartItems.filter(function (n) {
         return n.holder_id === holder_id;
       }) || [];
-      // 账号下没商品则不用处理
+      // 账号下没商品则处理所有购物车
       if (!accountCartItems.length) {
-        return {
-          selectedResource: null
-        };
+        accountCartItems = cartItems;
       }
       // duration=所有商品时间的集合
       var duration = accountCartItems.reduce(function (acc, n) {
@@ -1403,18 +1401,21 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
   }, {
     key: "autoSelectAllProductResources",
     value: function autoSelectAllProductResources(resources_code, timeSlots) {
-      var _this7 = this;
+      var _dateRange$,
+        _this7 = this;
       var dateRange = this.store.date.getDateRange();
       var resources = [];
-      dateRange.forEach(function (n) {
-        if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
-      });
+      if (dateRange !== null && dateRange !== void 0 && (_dateRange$ = dateRange[0]) !== null && _dateRange$ !== void 0 && _dateRange$.date) {
+        dateRange.forEach(function (n) {
+          if (n.resource) resources.push.apply(resources, _toConsumableArray(n.resource));
+        });
+      }
       var resourcesMap = getResourcesMap(cloneDeep(resources));
       // 一个账号一个账号处理
       var errorList = [];
       var selectResourcesMap = {};
-      this.store.accountList.getAccounts().forEach(function (account) {
-        var cartItems = _this7.store.cart.getCartByAccount(account.getId());
+      var accountList = this.store.accountList.getAccounts();
+      var selectForCartResources = function selectForCartResources(cartItems) {
         var recordTimeSlots = cloneDeep(timeSlots);
         // timeSlots 传进来的只是用户选中的时间片，但是实际上需要根据多个商品时间进行累加
         // 假设 timeSlots.start_time 是15:40 duration 是 30min
@@ -1429,7 +1430,16 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
           var currentCapacity = getSumCapacity({
             capacity: formatCapacity
           });
-          if (timeSlots) {
+          // 如果商品已经有时间数据了，意味着是通过先选日期再选商品流程进来的，相当于时间切片已经选中了
+          if (item._origin.start_time && !(timeSlots !== null && timeSlots !== void 0 && timeSlots.start_time)) {
+            recordTimeSlots = {
+              start_time: item._origin.start_time,
+              end_time: item._origin.end_time,
+              start_at: dayjs("".concat(item.start_date, " ").concat(item._origin.start_time)),
+              end_at: dayjs("".concat(item.end_date, " ").concat(item._origin.end_time))
+            };
+          }
+          if (recordTimeSlots) {
             if (index !== 0 && recordTimeSlots) {
               var _item$_productOrigin$, _item$_productOrigin3, _ref10, _item$_productOrigin4, _item$_productOrigin$2, _item$_productOrigin5, _ref11, _item$_productOrigin6;
               var start_at = dayjs(recordTimeSlots.end_time).add((_item$_productOrigin$ = (_item$_productOrigin3 = item._productOrigin) === null || _item$_productOrigin3 === void 0 || (_item$_productOrigin3 = _item$_productOrigin3.duration) === null || _item$_productOrigin3 === void 0 ? void 0 : _item$_productOrigin3.value) !== null && _item$_productOrigin$ !== void 0 ? _item$_productOrigin$ : 0, (_ref10 = (_item$_productOrigin4 = item._productOrigin) === null || _item$_productOrigin4 === void 0 || (_item$_productOrigin4 = _item$_productOrigin4.duration) === null || _item$_productOrigin4 === void 0 ? void 0 : _item$_productOrigin4.type) !== null && _ref10 !== void 0 ? _ref10 : 'minutes');
@@ -1506,14 +1516,24 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   return existingRes.resourceType !== targetRenderList[0].resourceType;
                 })), [targetResource])
               });
-              console.log(account, '已分配');
             } else {
               // 如果没有可用的技师了，推到错误列表里让 UI 去提示
               errorList.push(item._id);
             }
           }
         });
-      });
+      };
+      var cartItems = this.store.cart.getItems();
+
+      // 如果购物车里没有 holderid数据，证明不按 holder 类流程预约走，给所有购物车一次性分派即可，不做账号下资源互斥逻辑
+      if (cartItems !== null && cartItems !== void 0 && cartItems[0].holder_id) {
+        accountList.forEach(function (account) {
+          var cartItems = _this7.store.cart.getCartByAccount(account.getId());
+          selectForCartResources(cartItems);
+        });
+      } else {
+        selectForCartResources(cartItems);
+      }
       return {
         errorList: errorList
       };
@@ -1527,6 +1547,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
       // 取出购物车中所有一已选择的第一步资源
       var resources = [];
       var cartItems = this.store.cart.getItems();
+      if (cartItems !== null && cartItems !== void 0 && cartItems[0].start_date) return [];
       var resourceIds = [];
       cartItems.forEach(function (item) {
         var _item$_productOrigin8;

package/lib/modules/Cart/types.d.ts

@@ -173,7 +173,7 @@ export interface IUpdateItemParams {
     /** 关联表单 */
     relationForms?: {
         /** 关联表单ID */
-        form_id: number[];
+        form_id: number;
         /** 关联表单记录ID */
         form_record_ids: number[];
     }[];

package/lib/modules/Cart/utils.d.ts

@@ -98,14 +98,14 @@ export declare const formatResourceToCartItemOrigin: (params: {
 export declare const formatRelationFormsToCartItem: (params: {
     cartItem: CartItem;
     relationForms: {
-        form_id: number[];
+        form_id: number;
         form_record_ids: number[];
     }[];
 }) => CartItem;
 export declare const formatRelationFormsToCartItemOrigin: (params: {
     cartItem: CartItem;
     relationForms: {
-        form_id: number[];
+        form_id: number;
         form_record_ids: number[];
     }[];
 }) => any;
@@ -230,8 +230,8 @@ export declare const handleProductDeposit: (params: {
     total: string | number;
     num: number;
 }) => {
-    depositTotal: Decimal;
     result: boolean;
+    depositTotal: Decimal;
 };
 /**
  * 从购物车中删除资源相关信息

package/lib/modules/Cart/utils.js

@@ -475,7 +475,10 @@ var getProductDeposit = (params) => {
 };
 var handleProductDeposit = (params) => {
   const { depositData, total, num } = params;
-  const { deposit_fixed, deposit_percentage } = depositData;
+  if (!depositData) {
+    return { result: false, depositTotal: new import_decimal.default(0) };
+  }
+  const { deposit_fixed, deposit_percentage } = depositData || {};
   if (typeof deposit_fixed === "string" && typeof deposit_percentage === "string") {
     const depositFixed = (0, import_decimal.default)(deposit_fixed || 0);
     const depositPercent = (0, import_decimal.default)(deposit_percentage || 0);
@@ -488,17 +491,8 @@ var handleProductDeposit = (params) => {
 var deleteResourceFromCartItem = (cartItem) => {
   cartItem.resource_id = void 0;
   cartItem.relation_form_name = void 0;
-  cartItem.start_date = void 0;
-  cartItem.start_time = void 0;
-  cartItem.end_date = void 0;
-  cartItem.end_time = void 0;
   delete cartItem._resourceOrigin;
   cartItem._origin.resources = null;
-  cartItem._origin.select_date = null;
-  cartItem._origin.start_date = null;
-  cartItem._origin.start_time = null;
-  cartItem._origin.end_date = null;
-  cartItem._origin.end_time = null;
   return cartItem;
 };
 var deleteTimeFromCartItem = (cartItem) => {

package/lib/solution/BookingByStep/index.js

@@ -744,11 +744,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }) {
     const dateRange = this.store.date.getDateRange();
     const cartItems = this.store.cart.getItems();
-    const accountCartItems = cartItems.filter((n) => n.holder_id === holder_id) || [];
+    let accountCartItems = cartItems.filter((n) => n.holder_id === holder_id) || [];
     if (!accountCartItems.length) {
-      return {
-        selectedResource: null
-      };
+      accountCartItems = cartItems;
     }
     let duration = accountCartItems.reduce((acc, n) => {
       var _a, _b;
@@ -806,26 +804,37 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 给所有购物车里的商品先分配一个资源
   autoSelectAllProductResources(resources_code, timeSlots) {
+    var _a;
     const dateRange = this.store.date.getDateRange();
     const resources = [];
-    dateRange.forEach((n) => {
-      if (n.resource)
-        resources.push(...n.resource);
-    });
+    if ((_a = dateRange == null ? void 0 : dateRange[0]) == null ? void 0 : _a.date) {
+      dateRange.forEach((n) => {
+        if (n.resource)
+          resources.push(...n.resource);
+      });
+    }
     const resourcesMap = (0, import_utils.getResourcesMap)((0, import_lodash_es.cloneDeep)(resources));
     const errorList = [];
     const selectResourcesMap = {};
-    this.store.accountList.getAccounts().forEach((account) => {
-      const cartItems = this.store.cart.getCartByAccount(account.getId());
+    const accountList = this.store.accountList.getAccounts();
+    const selectForCartResources = (cartItems2) => {
       let recordTimeSlots = (0, import_lodash_es.cloneDeep)(timeSlots);
-      cartItems.forEach((item, index) => {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+      cartItems2.forEach((item, index) => {
+        var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
         const formatCapacity = (0, import_resources.formatDefaultCapacitys)({
-          capacity: (_a = item._productOrigin) == null ? void 0 : _a.capacity,
+          capacity: (_a2 = item._productOrigin) == null ? void 0 : _a2.capacity,
           product_bundle: item._origin.product.product_bundle
         });
         const currentCapacity = (0, import_resources.getSumCapacity)({ capacity: formatCapacity });
-        if (timeSlots) {
+        if (item._origin.start_time && !(timeSlots == null ? void 0 : timeSlots.start_time)) {
+          recordTimeSlots = {
+            start_time: item._origin.start_time,
+            end_time: item._origin.end_time,
+            start_at: (0, import_dayjs.default)(`${item.start_date} ${item._origin.start_time}`),
+            end_at: (0, import_dayjs.default)(`${item.end_date} ${item._origin.end_time}`)
+          };
+        }
+        if (recordTimeSlots) {
           if (index !== 0 && recordTimeSlots) {
             let start_at = (0, import_dayjs.default)(recordTimeSlots.end_time).add(
               ((_c = (_b = item._productOrigin) == null ? void 0 : _b.duration) == null ? void 0 : _c.value) ?? 0,
@@ -913,13 +922,21 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
                 targetResource
               ]
             });
-            console.log(account, "已分配");
           } else {
             errorList.push(item._id);
           }
         }
       });
-    });
+    };
+    const cartItems = this.store.cart.getItems();
+    if (cartItems == null ? void 0 : cartItems[0].holder_id) {
+      accountList.forEach((account) => {
+        const cartItems2 = this.store.cart.getCartByAccount(account.getId());
+        selectForCartResources(cartItems2);
+      });
+    } else {
+      selectForCartResources(cartItems);
+    }
     return { errorList };
   }
   // 从购物车中获取已经分配好第一步资源的所有时间片
@@ -927,6 +944,8 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     const dateRange = this.store.date.getDateRange();
     const resources = [];
     const cartItems = this.store.cart.getItems();
+    if (cartItems == null ? void 0 : cartItems[0].start_date)
+      return [];
     const resourceIds = [];
     cartItems.forEach((item) => {
       var _a, _b, _c;
@@ -964,14 +983,17 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   // 提交时间切片，绑定到对应购物车的商品上，更新购物车
   submitTimeSlot(timeSlots) {
     const cartItems = this.store.cart.getItems();
-    const itemsByAccount = cartItems.reduce((acc, item) => {
-      const holderId = item.holder_id;
-      if (!acc[holderId]) {
-        acc[holderId] = [];
-      }
-      acc[holderId].push(item);
-      return acc;
-    }, {});
+    const itemsByAccount = cartItems.reduce(
+      (acc, item) => {
+        const holderId = item.holder_id;
+        if (!acc[holderId]) {
+          acc[holderId] = [];
+        }
+        acc[holderId].push(item);
+        return acc;
+      },
+      {}
+    );
     Object.values(itemsByAccount).forEach((accountItems) => {
       let currentStartTime = timeSlots.start_at.format("YYYY-MM-DD HH:mm");
       accountItems.forEach((item, index) => {
@@ -1123,7 +1145,9 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
     });
     if (date) {
       const cartItems = this.store.cart.getItems();
-      const cartItemsByDate = cartItems.filter((n) => !(0, import_dayjs.default)(n.start_date).isSame((0, import_dayjs.default)(date.startTime), "day"));
+      const cartItemsByDate = cartItems.filter(
+        (n) => !(0, import_dayjs.default)(n.start_date).isSame((0, import_dayjs.default)(date.startTime), "day")
+      );
       if (cartItemsByDate.length) {
         cartItemsByDate.forEach((n) => {
           this.store.cart.removeItem(n._id);

package/package.json

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