@pisell/pisellos 2.2.198 → 2.2.200

package/dist/server/modules/order/types.d.ts

@@ -393,6 +393,8 @@ export interface OrderData {
     /** 本地辅助字段 */
     shop_id?: number;
     create_date?: string;
+    /** 本地待同步标记：1 表示需要后续同步到云端 */
+    need_sync?: 0 | 1 | number;
     /** 兼容：部分场景仍使用顶层 total_amount */
     total_amount?: OrderMoneyString | number;
     /** 扩展字段（物流、标签等）；使用 any 以便筛选与数据源扩展 */

package/dist/solution/BaseSales/index.js

@@ -2033,7 +2033,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
       var products = tempOrder === null || tempOrder === void 0 || (_tempOrder$products2 = tempOrder.products) === null || _tempOrder$products2 === void 0 ? void 0 : _tempOrder$products2.filter(function (n) {
         return n.product_id;
       });
-      return products.map(function (product) {
+      var walletProducts = products.map(function (product) {
         var _product$product_vari2, _product$is_charge_ta, _product$holder_id, _metadata$main_produc, _metadata$main_produc2;
         var metadata = product.metadata || {};
         return {
@@ -2079,6 +2079,7 @@ export var BaseSalesImpl = /*#__PURE__*/function (_BaseModule) {
           })
         };
       });
+      return walletProducts;
     }
   }, {
     key: "initWalletData",

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

@@ -126,6 +126,7 @@ export interface BaseSalesSummary {
     shipping_tax_fee: string;
     tax_fee: string;
     surcharge_fee: string;
+    surcharges?: any[];
     discount_amount: string;
     deposit_amount: string;
     deposit?: {

package/dist/solution/BaseSales/utils/transformBaseProductToOrderProduct.js

@@ -4,7 +4,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-import { composeLinePrice, normalizeProductSkuOptions, sumOptionUnitPrice } from "../../../modules/Order/utils";
+import { composeLinePrice, getBundleSellingMagnitude, normalizeProductSkuOptions, sumOptionUnitPrice } from "../../../modules/Order/utils";
 import { buildManualProductDiscountItem, mergeManualProductDiscountIntoList, resolveManualDiscountOriginTotal, resolveManualDiscountReasonFromSources, shouldBuildManualProductDiscount } from "../../../modules/Order/utils/manualProductDiscount";
 function toNumber(value) {
   var fallback = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 0;
@@ -49,18 +49,33 @@ function normalizeBundleItems(bundleItems) {
   var preferPriceField = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   if (!Array.isArray(bundleItems)) return [];
   return bundleItems.map(function (bundleItem) {
-    var _ref2, _ref3, _ref4, _bundleItem$price, _ref5, _ref6, _ref7, _bundleItem$bundle_se, _bundleItem$num, _bundleItem$quantity, _bundleItem$price2, _ref8, _ref9, _bundleItem$original_;
+    var _ref2, _ref3, _ref4, _bundleItem$price, _ref5, _ref6, _ref7, _bundleItem$bundle_se, _bundleItem$num, _bundleItem$price2, _bundleItem$quantity, _bundleItem$price3, _ref8, _ref9, _bundleItem$original_, _normalizedItem$price;
     var unitSelling = preferPriceField ? (_ref2 = (_ref3 = (_ref4 = (_bundleItem$price = bundleItem.price) !== null && _bundleItem$price !== void 0 ? _bundleItem$price : bundleItem.bundle_selling_price) !== null && _ref4 !== void 0 ? _ref4 : bundleItem.custom_price) !== null && _ref3 !== void 0 ? _ref3 : bundleItem.product_price) !== null && _ref2 !== void 0 ? _ref2 : '0' : (_ref5 = (_ref6 = (_ref7 = (_bundleItem$bundle_se = bundleItem.bundle_selling_price) !== null && _bundleItem$bundle_se !== void 0 ? _bundleItem$bundle_se : bundleItem.price) !== null && _ref7 !== void 0 ? _ref7 : bundleItem.custom_price) !== null && _ref6 !== void 0 ? _ref6 : bundleItem.product_price) !== null && _ref5 !== void 0 ? _ref5 : '0';
     var unitStr = toPriceString(unitSelling, '0.00');
     var num = toSafePositiveInt((_bundleItem$num = bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.num) !== null && _bundleItem$num !== void 0 ? _bundleItem$num : bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.quantity, 1);
-    return _objectSpread(_objectSpread({}, bundleItem), {}, {
+    var magnitudeSource = _objectSpread(_objectSpread({}, bundleItem), {}, {
+      option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option),
+      bundle_selling_price: unitStr,
+      // 计算 markdown 净额时，只传真实毛价；仅有 bundle_selling_price 时按历史净额兜底。
+      price: (_bundleItem$price2 = bundleItem.price) !== null && _bundleItem$price2 !== void 0 ? _bundleItem$price2 : bundleItem.custom_price
+    });
+    var normalizedItem = _objectSpread(_objectSpread({}, bundleItem), {}, {
       num: num,
       quantity: (_bundleItem$quantity = bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.quantity) !== null && _bundleItem$quantity !== void 0 ? _bundleItem$quantity : num,
-      price: (_bundleItem$price2 = bundleItem.price) !== null && _bundleItem$price2 !== void 0 ? _bundleItem$price2 : unitStr,
+      // price 保留毛价（markdown 仍为正），由 price_type 决定符号。
+      price: (_bundleItem$price3 = bundleItem.price) !== null && _bundleItem$price3 !== void 0 ? _bundleItem$price3 : unitStr,
       bundle_selling_price: unitStr,
       original_price: (_ref8 = (_ref9 = (_bundleItem$original_ = bundleItem.original_price) !== null && _bundleItem$original_ !== void 0 ? _bundleItem$original_ : bundleItem.product_price) !== null && _ref9 !== void 0 ? _ref9 : bundleItem.price) !== null && _ref8 !== void 0 ? _ref8 : unitStr,
       option: normalizeOptionItems(bundleItem === null || bundleItem === void 0 ? void 0 : bundleItem.option)
     });
+    // bundle_selling_price 落「正净额」：markdown = |price| − Σoptions；markup/原价维持原值。
+    normalizedItem.bundle_selling_price = getBundleSellingMagnitude(magnitudeSource).toFixed(2);
+    if (((_normalizedItem$price = normalizedItem.price_type) !== null && _normalizedItem$price !== void 0 ? _normalizedItem$price : normalizedItem.custom_price_type) === 'markdown' && (normalizedItem.price_type_ext === '' || normalizedItem.price_type_ext === undefined || normalizedItem.price_type_ext === null)) {
+      var _normalizedItem$custo;
+      normalizedItem.custom_price = (_normalizedItem$custo = normalizedItem.custom_price) !== null && _normalizedItem$custo !== void 0 ? _normalizedItem$custo : normalizedItem.price;
+      normalizedItem.price = normalizedItem.bundle_selling_price;
+    }
+    return normalizedItem;
   });
 }
 function findVariantById(origin, variantId) {

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

@@ -12,6 +12,8 @@ import { AddProductDecideContext, AddProductRequiresDetailPayload } from './util
 import { type BuildCacheItemFromOrderLineInput } from '../../modules/BookingContext/utils/buildCacheItemFromOrderLine';
 import { type BuildNormalProductCacheItemFromOrderLineInput } from '../../modules/BookingContext/utils/buildNormalProductCacheItemFromOrderLine';
 import type { AddProductBookingInput, OrderProduct, OrderProductIdentity, UpdateOrderProductParams } from '../../modules/Order/types';
+import { type TransitionChildBookingParams } from './utils/bookingStatus';
+export type { BookingTransitionAction, TransitionChildBookingParams, } from './utils/bookingStatus';
 export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
     protected defaultName: string;
     protected defaultVersion: string;
@@ -68,6 +70,27 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
      * @returns 接口返回的 data
      */
     setBookingStatus(status: string): Promise<any>;
+    /**
+     * 子预约状态机转移（POST /schedule/booking-transition/{schedule_event_id}）。
+     *
+     * 与 `setBookingStatus`（父预约 PUT appointment-status）不同，本方法按子预约
+     * `schedule_event_id` 调用状态转移接口，body 为 `{ action }`。
+     *
+     * 流程：能解析出目标状态时先乐观更新对应子预约的 `appointment_status`，
+     * 再调 POST；成功后强制刷新销售详情；失败则回滚该子预约本地状态并抛错。
+     * `reschedule` 暂未启用状态矩阵，跳过乐观更新仅调接口。
+     *
+     * @param params.schedule_event_id 子预约 schedule_event_id
+     * @param params.action 转移动作：confirm | reject | arrive | start | complete | cancel | no_show | reschedule
+     * @returns 接口返回的 data
+     *
+     * @example
+     * await bookingTicket.transitionChildBooking({
+     *   schedule_event_id: 301,
+     *   action: 'confirm',
+     * });
+     */
+    transitionChildBooking(params: TransitionChildBookingParams): Promise<any>;
     /**
      * 基于当前 tempOrder.order_id 强制从远端重新拉取销售详情。
      *