@pisell/pisellos 0.0.495 → 0.0.496

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

@@ -112,14 +112,14 @@ export interface SubmitScanOrderParams {
         products: SubmitScanOrderProduct[];
         bookings: SubmitScanOrderBooking[];
         payments: any[];
-        surcharges: any[];
+        surcharges?: any[];
         discount_list: any[];
         relation_forms: any[];
         form_record_ids?: SubmitScanOrderFormRecord[];
         contacts: any[];
         contacts_info: any[];
         holder: Record<string, any> | null;
-        summary: SubmitScanOrderSummary;
+        summary?: SubmitScanOrderSummary;
         metadata: Record<string, any>;
     };
 }

package/dist/modules/Order/utils.js

@@ -1,5 +1,5 @@
 var _excluded = ["_origin", "identity_key"],
-  _excluded2 = ["created_at"];
+  _excluded2 = ["created_at", "summary", "surcharges"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -233,8 +233,10 @@ export function buildSubmitPayload(params) {
     form_record_ids: [relationId]
   }] : undefined;
   var _createdAt = tempOrder.created_at,
-    tempOrderWithoutCreatedAt = _objectWithoutProperties(tempOrder, _excluded2);
-  return _objectSpread(_objectSpread({}, tempOrderWithoutCreatedAt), {}, {
+    _summary = tempOrder.summary,
+    _surcharges = tempOrder.surcharges,
+    tempOrderRest = _objectWithoutProperties(tempOrder, _excluded2);
+  return _objectSpread(_objectSpread({}, tempOrderRest), {}, {
     platform: normalizeSubmitPlatform(tempOrder.platform),
     request_unique_idempotency_token: cacheId,
     type: tempOrder.type || 'table-order',
@@ -254,7 +256,6 @@ export function buildSubmitPayload(params) {
     schedule_date: scheduleDate,
     bookings: bookings,
     payments: tempOrder.payments || [],
-    surcharges: tempOrder.surcharges || [],
     // discount_list: tempOrder.discount_list || [],
     relation_forms: tempOrder.relation_forms || [],
     form_record_ids: formRecordIds,

package/dist/modules/SalesSummary/utils.js

@@ -304,8 +304,10 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
 
       // --- 主商品折后税费 ---
       var mainTotal = getMainProductPaymentTotal(product);
+      var surchargeFee = toDecimal(product.surcharge_fee);
+      var mainTaxableBase = mainTotal.lte(0) ? surchargeFee : mainTotal.plus(surchargeFee);
       var mainTaxPrecise = calculateSingleItemTax({
-        price: mainTotal,
+        price: mainTaxableBase,
         taxRate: rate,
         isPriceIncludeTax: isPriceIncludeTax,
         isChargeTax: (_product$is_charge_ta2 = product.is_charge_tax) !== null && _product$is_charge_ta2 !== void 0 ? _product$is_charge_ta2 : 0
@@ -320,8 +322,9 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
 
       // --- 主商品原价税费 ---
       var originalTotal = getUnitOriginalTotal(product);
+      var originalTaxableBase = originalTotal.lte(0) ? surchargeFee : originalTotal.plus(surchargeFee);
       var originalTaxPrecise = calculateSingleItemTax({
-        price: originalTotal,
+        price: originalTaxableBase,
         taxRate: rate,
         isPriceIncludeTax: isPriceIncludeTax,
         isChargeTax: (_product$is_charge_ta3 = product.is_charge_tax) !== null && _product$is_charge_ta3 !== void 0 ? _product$is_charge_ta3 : 0
@@ -451,16 +454,6 @@ export function calculateSalesSummary(params) {
   var productAmount = products.reduce(function (sum, item) {
     return sum.plus(getUnitPaymentTotal(item).times(getSafeNum(item.num)));
   }, new Decimal(0));
-  var hasTaxRate = taxRate !== undefined && taxRate !== null && taxRate > 0;
-  var productTaxFee;
-  if (hasTaxRate) {
-    var taxResult = calculateProductsTax(products, taxRate, isPriceIncludeTax);
-    productTaxFee = taxResult.tax;
-  } else {
-    productTaxFee = products.reduce(function (sum, item) {
-      return sum.plus(toDecimal(item.tax_fee).times(getSafeNum(item.num)));
-    }, new Decimal(0));
-  }
   var surchargeServiceItems = buildSurchargeServiceItems(products);
   var surcharge = getSurcharge({
     service: surchargeServiceItems,
@@ -479,6 +472,20 @@ export function calculateSalesSummary(params) {
   }, surcharge, {
     isEdit: false
   }) || 0);
+  for (var i = 0; i < products.length; i++) {
+    var _surchargeServiceItem;
+    products[i].surcharge_fee = ((_surchargeServiceItem = surchargeServiceItems[i]) === null || _surchargeServiceItem === void 0 ? void 0 : _surchargeServiceItem.surcharge_fee) || 0;
+  }
+  var hasTaxRate = taxRate !== undefined && taxRate !== null && taxRate > 0;
+  var productTaxFee;
+  if (hasTaxRate) {
+    var taxResult = calculateProductsTax(products, taxRate, isPriceIncludeTax);
+    productTaxFee = taxResult.tax;
+  } else {
+    productTaxFee = products.reduce(function (sum, item) {
+      return sum.plus(toDecimal(item.tax_fee).times(getSafeNum(item.num)));
+    }, new Decimal(0));
+  }
   var expectAmount = productAmount.plus(surchargeAmount);
   var totalAmount = isPriceIncludeTax === 1 ? expectAmount : expectAmount.plus(productTaxFee);
   var deposit = calculateProductsDeposit(products);

package/dist/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 4 | 2 | 3 | 6 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -330,7 +330,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/dist/solution/ScanOrder/types.d.ts

@@ -122,7 +122,7 @@ export interface ScanOrderTempOrder {
     summary: ScanOrderSummary;
     metadata: Record<string, any>;
 }
-export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platform' | 'products' | 'created_at'> {
+export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platform' | 'products' | 'created_at' | 'summary' | 'surcharges'> {
     platform: 'H5' | 'PC';
     request_unique_idempotency_token?: string;
     form_record_ids?: Array<{

package/dist/solution/VenueBooking/utils/slotMerge.js

@@ -66,8 +66,8 @@ export function buildPriceBreakdown(params) {
         productId: productId,
         datetime: slot.startTime
       }) : 0;
-      var startHm = dayjs(slot.startTime, 'YYYY-MM-DD HH:mm').format('HH:mm');
-      var endHm = dayjs(slot.endTime, 'YYYY-MM-DD HH:mm').format('HH:mm');
+      var startHm = dayjs(slot.startTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD HH:mm');
+      var endHm = dayjs(slot.endTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD HH:mm');
       var last = entries[entries.length - 1];
       if (last && last.unit_price === unitPrice && last.quotation_shelf_id === shelfId && last.end_time === startHm) {
         last.end_time = endHm;
@@ -150,7 +150,6 @@ export function expandMergedSlotToIndividual(product, slotDurationMinutes) {
   var endTime = meta.end_time;
   if (!startTime || !endTime) return [];
   var breakdown = meta.price_breakdown;
-  var datePrefix = dayjs(startTime, 'YYYY-MM-DD HH:mm').format('YYYY-MM-DD');
   var result = [];
   var cursor = dayjs(startTime, 'YYYY-MM-DD HH:mm');
   var end = dayjs(endTime, 'YYYY-MM-DD HH:mm');
@@ -161,8 +160,8 @@ export function expandMergedSlotToIndividual(product, slotDurationMinutes) {
     try {
       for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
         var entry = _step2.value;
-        var entryCursor = dayjs("".concat(datePrefix, " ").concat(entry.start_time), 'YYYY-MM-DD HH:mm');
-        var entryEnd = dayjs("".concat(datePrefix, " ").concat(entry.end_time), 'YYYY-MM-DD HH:mm');
+        var entryCursor = dayjs(entry.start_time, 'YYYY-MM-DD HH:mm');
+        var entryEnd = dayjs(entry.end_time, 'YYYY-MM-DD HH:mm');
         while (entryCursor.isBefore(entryEnd)) {
           priceMap.set(entryCursor.format('HH:mm'), entry.unit_price);
           entryCursor = entryCursor.add(slotDurationMinutes, 'minute');

package/lib/model/strategy/adapter/promotion/index.js

@@ -0,0 +1,49 @@
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/model/strategy/adapter/promotion/index.ts
+var promotion_exports = {};
+__export(promotion_exports, {
+  BUY_X_GET_Y_FREE_STRATEGY: () => import_examples.BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter: () => import_adapter.PromotionAdapter,
+  PromotionEvaluator: () => import_evaluator.PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY: () => import_examples.X_ITEMS_FOR_Y_PRICE_STRATEGY,
+  default: () => import_adapter2.default
+});
+module.exports = __toCommonJS(promotion_exports);
+var import_evaluator = require("./evaluator");
+var import_adapter = require("./adapter");
+var import_adapter2 = __toESM(require("./adapter"));
+var import_examples = require("./examples");
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  BUY_X_GET_Y_FREE_STRATEGY,
+  PromotionAdapter,
+  PromotionEvaluator,
+  X_ITEMS_FOR_Y_PRICE_STRATEGY
+});

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

@@ -112,14 +112,14 @@ export interface SubmitScanOrderParams {
         products: SubmitScanOrderProduct[];
         bookings: SubmitScanOrderBooking[];
         payments: any[];
-        surcharges: any[];
+        surcharges?: any[];
         discount_list: any[];
         relation_forms: any[];
         form_record_ids?: SubmitScanOrderFormRecord[];
         contacts: any[];
         contacts_info: any[];
         holder: Record<string, any> | null;
-        summary: SubmitScanOrderSummary;
+        summary?: SubmitScanOrderSummary;
         metadata: Record<string, any>;
     };
 }

package/lib/modules/Order/utils.js

@@ -235,9 +235,9 @@ function buildSubmitPayload(params) {
     form_id: tableFormId,
     form_record_ids: [relationId]
   }] : void 0;
-  const { created_at: _createdAt, ...tempOrderWithoutCreatedAt } = tempOrder;
+  const { created_at: _createdAt, summary: _summary, surcharges: _surcharges, ...tempOrderRest } = tempOrder;
   return {
-    ...tempOrderWithoutCreatedAt,
+    ...tempOrderRest,
     platform: normalizeSubmitPlatform(tempOrder.platform),
     request_unique_idempotency_token: cacheId,
     type: tempOrder.type || "table-order",
@@ -257,7 +257,6 @@ function buildSubmitPayload(params) {
     schedule_date: scheduleDate,
     bookings,
     payments: tempOrder.payments || [],
-    surcharges: tempOrder.surcharges || [],
     // discount_list: tempOrder.discount_list || [],
     relation_forms: tempOrder.relation_forms || [],
     form_record_ids: formRecordIds,

package/lib/modules/SalesSummary/utils.js

@@ -259,8 +259,10 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
   for (const product of products) {
     const quantity = new import_decimal.default(getSafeNum(product.num));
     const mainTotal = getMainProductPaymentTotal(product);
+    const surchargeFee = toDecimal(product.surcharge_fee);
+    const mainTaxableBase = mainTotal.lte(0) ? surchargeFee : mainTotal.plus(surchargeFee);
     const mainTaxPrecise = calculateSingleItemTax({
-      price: mainTotal,
+      price: mainTaxableBase,
       taxRate: rate,
       isPriceIncludeTax,
       isChargeTax: product.is_charge_tax ?? 0
@@ -270,8 +272,9 @@ function calculateProductsTax(products, taxRate, isPriceIncludeTax) {
       lastTaxableItem = { type: "main", item: product };
     }
     const originalTotal = getUnitOriginalTotal(product);
+    const originalTaxableBase = originalTotal.lte(0) ? surchargeFee : originalTotal.plus(surchargeFee);
     const originalTaxPrecise = calculateSingleItemTax({
-      price: originalTotal,
+      price: originalTaxableBase,
       taxRate: rate,
       isPriceIncludeTax,
       isChargeTax: product.is_charge_tax ?? 0
@@ -358,6 +361,7 @@ function createEmptySalesSummary() {
   };
 }
 function calculateSalesSummary(params) {
+  var _a;
   const {
     products,
     isPriceIncludeTax,
@@ -380,17 +384,6 @@ function calculateSalesSummary(params) {
     (sum, item) => sum.plus(getUnitPaymentTotal(item).times(getSafeNum(item.num))),
     new import_decimal.default(0)
   );
-  const hasTaxRate = taxRate !== void 0 && taxRate !== null && taxRate > 0;
-  let productTaxFee;
-  if (hasTaxRate) {
-    const taxResult = calculateProductsTax(products, taxRate, isPriceIncludeTax);
-    productTaxFee = taxResult.tax;
-  } else {
-    productTaxFee = products.reduce(
-      (sum, item) => sum.plus(toDecimal(item.tax_fee).times(getSafeNum(item.num))),
-      new import_decimal.default(0)
-    );
-  }
   const surchargeServiceItems = buildSurchargeServiceItems(products);
   const surcharge = (0, import_utils.getSurcharge)(
     {
@@ -413,6 +406,20 @@ function calculateSalesSummary(params) {
       { isEdit: false }
     ) || 0
   );
+  for (let i = 0; i < products.length; i++) {
+    products[i].surcharge_fee = ((_a = surchargeServiceItems[i]) == null ? void 0 : _a.surcharge_fee) || 0;
+  }
+  const hasTaxRate = taxRate !== void 0 && taxRate !== null && taxRate > 0;
+  let productTaxFee;
+  if (hasTaxRate) {
+    const taxResult = calculateProductsTax(products, taxRate, isPriceIncludeTax);
+    productTaxFee = taxResult.tax;
+  } else {
+    productTaxFee = products.reduce(
+      (sum, item) => sum.plus(toDecimal(item.tax_fee).times(getSafeNum(item.num))),
+      new import_decimal.default(0)
+    );
+  }
   const expectAmount = productAmount.plus(surchargeAmount);
   const totalAmount = isPriceIncludeTax === 1 ? expectAmount : expectAmount.plus(productTaxFee);
   const deposit = calculateProductsDeposit(products);

package/lib/solution/BookingByStep/index.d.ts

@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 4 | 2 | 3 | 6 | 5;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;
@@ -330,7 +330,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         count: number;
         left: number;
         summaryCount: number;
-        status: "lots_of_space" | "filling_up_fast" | "sold_out";
+        status: "sold_out" | "lots_of_space" | "filling_up_fast";
     }[];
     /**
      * 找到多个资源的公共可用时间段

package/lib/solution/ScanOrder/types.d.ts

@@ -122,7 +122,7 @@ export interface ScanOrderTempOrder {
     summary: ScanOrderSummary;
     metadata: Record<string, any>;
 }
-export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platform' | 'products' | 'created_at'> {
+export interface ScanOrderSubmitPayload extends Omit<ScanOrderTempOrder, 'platform' | 'products' | 'created_at' | 'summary' | 'surcharges'> {
     platform: 'H5' | 'PC';
     request_unique_idempotency_token?: string;
     form_record_ids?: Array<{

package/lib/solution/VenueBooking/utils/slotMerge.js

@@ -88,8 +88,8 @@ function buildPriceBreakdown(params) {
   for (const slot of group.slots) {
     const unitPrice = Number(slot.price || "0");
     const shelfId = quotation ? quotation.getQuotationShelfId({ productId, datetime: slot.startTime }) : 0;
-    const startHm = (0, import_dayjs.default)(slot.startTime, "YYYY-MM-DD HH:mm").format("HH:mm");
-    const endHm = (0, import_dayjs.default)(slot.endTime, "YYYY-MM-DD HH:mm").format("HH:mm");
+    const startHm = (0, import_dayjs.default)(slot.startTime, "YYYY-MM-DD HH:mm").format("YYYY-MM-DD HH:mm");
+    const endHm = (0, import_dayjs.default)(slot.endTime, "YYYY-MM-DD HH:mm").format("YYYY-MM-DD HH:mm");
     const last = entries[entries.length - 1];
     if (last && last.unit_price === unitPrice && last.quotation_shelf_id === shelfId && last.end_time === startHm) {
       last.end_time = endHm;
@@ -157,15 +157,14 @@ function expandMergedSlotToIndividual(product, slotDurationMinutes) {
   if (!startTime || !endTime)
     return [];
   const breakdown = meta.price_breakdown;
-  const datePrefix = (0, import_dayjs.default)(startTime, "YYYY-MM-DD HH:mm").format("YYYY-MM-DD");
   const result = [];
   let cursor = (0, import_dayjs.default)(startTime, "YYYY-MM-DD HH:mm");
   const end = (0, import_dayjs.default)(endTime, "YYYY-MM-DD HH:mm");
   if (breakdown == null ? void 0 : breakdown.length) {
     const priceMap = /* @__PURE__ */ new Map();
     for (const entry of breakdown) {
-      let entryCursor = (0, import_dayjs.default)(`${datePrefix} ${entry.start_time}`, "YYYY-MM-DD HH:mm");
-      const entryEnd = (0, import_dayjs.default)(`${datePrefix} ${entry.end_time}`, "YYYY-MM-DD HH:mm");
+      let entryCursor = (0, import_dayjs.default)(entry.start_time, "YYYY-MM-DD HH:mm");
+      const entryEnd = (0, import_dayjs.default)(entry.end_time, "YYYY-MM-DD HH:mm");
       while (entryCursor.isBefore(entryEnd)) {
         priceMap.set(entryCursor.format("HH:mm"), entry.unit_price);
         entryCursor = entryCursor.add(slotDurationMinutes, "minute");

package/package.json

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