@pisell/pisellos 0.0.449 → 0.0.450

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/dist/modules/Product/index.d.ts +1 -1
  2. package/dist/modules/Summary/utils.js +2 -6
  3. package/dist/solution/BookingByStep/index.d.ts +1 -1
  4. package/dist/solution/BookingTicket/index.d.ts +1 -1
  5. package/lib/modules/Product/index.d.ts +1 -1
  6. package/lib/modules/Summary/utils.js +1 -3
  7. package/lib/solution/BookingByStep/index.d.ts +1 -1
  8. package/lib/solution/BookingTicket/index.d.ts +1 -1
  9. package/package.json +1 -1
package/dist/modules/Product/index.d.ts CHANGED
@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
49
49
  getCategories(): ProductCategory[];
50
50
  setOtherParams(key: string, value: any): void;
51
51
  getOtherParams(): any;
52
- getProductType(): "normal" | "duration" | "session";
52
+ getProductType(): "duration" | "session" | "normal";
53
53
  }
package/dist/modules/Summary/utils.js CHANGED
@@ -738,12 +738,8 @@ var getMainProductTotal = function getMainProductTotal(item) {
738
738
  var bundleItem = _step4.value;
739
739
  if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
740
740
  var _ref10, _bundleItem$bundle_se2;
741
- // 子商品折扣金额
742
- var discountAmount = getDiscountAmount(bundleItem.discount_list);
743
- // 子商品价格
744
- var bundleItemPrice = new Decimal((_ref10 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
745
- // todo: 套餐子商品后不需要处理 子商品价格 - 子商品折扣金额
746
- var bundleItemTotal = bundleItemPrice.minus(discountAmount);
741
+ // IMPORTANT: 套餐子商品如果应用了 discount，bundle_selling_price和 price 其实都已经是折后价格了，不需要单独再减一次
742
+ var bundleItemTotal = new Decimal((_ref10 = (_bundleItem$bundle_se2 = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se2 !== void 0 ? _bundleItem$bundle_se2 : bundleItem.price) !== null && _ref10 !== void 0 ? _ref10 : 0);
747
743
  total = total.add(bundleItemTotal);
748
744
  }
749
745
  }
package/dist/solution/BookingByStep/index.d.ts CHANGED
@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
311
311
  date: string;
312
312
  status: string;
313
313
  week: string;
314
- weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
314
+ weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
315
315
  }[]>;
316
316
  submitTimeSlot(timeSlots: TimeSliceItem): void;
317
317
  private getScheduleDataByIds;
package/dist/solution/BookingTicket/index.d.ts CHANGED
@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
123
123
  * 获取当前的客户搜索条件
124
124
  * @returns 当前搜索条件
125
125
  */
126
- getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
126
+ getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
127
127
  /**
128
128
  * 获取客户列表状态（包含滚动加载相关状态）
129
129
  * @returns 客户状态
package/lib/modules/Product/index.d.ts CHANGED
@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
49
49
  getCategories(): ProductCategory[];
50
50
  setOtherParams(key: string, value: any): void;
51
51
  getOtherParams(): any;
52
- getProductType(): "normal" | "duration" | "session";
52
+ getProductType(): "duration" | "session" | "normal";
53
53
  }
package/lib/modules/Summary/utils.js CHANGED
@@ -458,9 +458,7 @@ var getMainProductTotal = (item) => {
458
458
  }
459
459
  for (let bundleItem of (item == null ? void 0 : item.bundle) || []) {
460
460
  if (getBundleItemIsMarkupOrDiscountPrice(bundleItem)) {
461
- const discountAmount = getDiscountAmount(bundleItem.discount_list);
462
- const bundleItemPrice = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
463
- const bundleItemTotal = bundleItemPrice.minus(discountAmount);
461
+ const bundleItemTotal = new import_decimal.default(bundleItem.bundle_selling_price ?? bundleItem.price ?? 0);
464
462
  total = total.add(bundleItemTotal);
465
463
  }
466
464
  }
package/lib/solution/BookingByStep/index.d.ts CHANGED
@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
311
311
  date: string;
312
312
  status: string;
313
313
  week: string;
314
- weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
314
+ weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
315
315
  }[]>;
316
316
  submitTimeSlot(timeSlots: TimeSliceItem): void;
317
317
  private getScheduleDataByIds;
package/lib/solution/BookingTicket/index.d.ts CHANGED
@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
123
123
  * 获取当前的客户搜索条件
124
124
  * @returns 当前搜索条件
125
125
  */
126
- getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
126
+ getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
127
127
  /**
128
128
  * 获取客户列表状态（包含滚动加载相关状态）
129
129
  * @returns 客户状态
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": false,
3
3
  "name": "@pisell/pisellos",
4
- "version": "0.0.449",
4
+ "version": "0.0.450",
5
5
  "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
6
6
  "main": "dist/index.js",
7
7
  "types": "dist/index.d.ts",