@pisell/pisellos 0.0.422 → 0.0.424

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

@@ -33,6 +33,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         is_deposit: number;
         relation_products: any[];
         relation_forms: any[];
+        business_code: string | undefined;
     };
     checkBeforeSubmitOrder(params: {
         cartItems: CartItem[];

package/dist/modules/Order/index.js

@@ -130,7 +130,8 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
         schedule_date: '',
         is_deposit: 0,
         relation_products: [],
-        relation_forms: []
+        relation_forms: [],
+        business_code: params === null || params === void 0 ? void 0 : params.business_code
       }, (params === null || params === void 0 ? void 0 : params.extraData) || {});
       var is_deposit = 0; // 是否存在定金，0 不存在，1 存在
       if (params.cartItems.length > 0) {

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

@@ -17,6 +17,7 @@ export interface CommitOrderParams {
         type: 'virtual' | 'appointment_booking';
         platform?: 'pc' | 'h5';
         extraData?: Record<string, any>;
+        business_code?: string;
     };
 }
 /**

package/dist/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/dist/modules/Summary/utils.js

@@ -678,8 +678,10 @@ var getDiscountAmount = function getDiscountAmount(discounts) {
  * 获取主商品加价减价后的总价 (主商品价格 + 子商品加价减价)
  */
 var getMainProductTotal = function getMainProductTotal(item) {
-  var _ref7, _ref8, _item$main_product_se, _item$metadata;
+  var _ref7, _ref8, _item$main_product_se, _item$metadata, _item$_origin3, _item$_originData$pro;
   var total = new Decimal((_ref7 = (_ref8 = (_item$main_product_se = item === null || item === void 0 ? void 0 : item.main_product_selling_price) !== null && _item$main_product_se !== void 0 ? _item$main_product_se : item === null || item === void 0 || (_item$metadata = item.metadata) === null || _item$metadata === void 0 ? void 0 : _item$metadata.main_product_selling_price) !== null && _ref8 !== void 0 ? _ref8 : item.price) !== null && _ref7 !== void 0 ? _ref7 : 0);
+  var mainProductDiscountAmount = getDiscountAmount((item === null || item === void 0 || (_item$_origin3 = item._origin) === null || _item$_origin3 === void 0 || (_item$_origin3 = _item$_origin3.product) === null || _item$_origin3 === void 0 ? void 0 : _item$_origin3.discount_list) || (item === null || item === void 0 || (_item$_originData$pro = item._originData.product) === null || _item$_originData$pro === void 0 ? void 0 : _item$_originData$pro.discount_list) || []);
+  total = total.minus(mainProductDiscountAmount);
 
   // 单规格
   if (item !== null && item !== void 0 && item.option && Array.isArray(item === null || item === void 0 ? void 0 : item.option)) {

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

@@ -358,7 +358,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/dist/solution/BookingByStep/index.js

@@ -978,6 +978,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
     key: "submitOrder",
     value: function () {
       var _submitOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee19(extraData) {
+        var _this$otherParams4;
         var cartItems, newCartItems, type;
         return _regeneratorRuntime().wrap(function _callee19$(_context19) {
           while (1) switch (_context19.prev = _context19.next) {
@@ -1015,6 +1016,7 @@ export var BookingByStepImpl = /*#__PURE__*/function (_BaseModule) {
                   cartItems: newCartItems,
                   type: type,
                   platform: this.platform,
+                  business_code: (_this$otherParams4 = this.otherParams) === null || _this$otherParams4 === void 0 ? void 0 : _this$otherParams4.business_code,
                   extraData: extraData
                 }
               }));

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

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

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

@@ -33,6 +33,7 @@ export declare class OrderModule extends BaseModule implements Module, OrderModu
         is_deposit: number;
         relation_products: any[];
         relation_forms: any[];
+        business_code: string | undefined;
     };
     checkBeforeSubmitOrder(params: {
         cartItems: CartItem[];

package/lib/modules/Order/index.js

@@ -106,6 +106,7 @@ var OrderModule = class extends import_BaseModule.BaseModule {
       is_deposit: 0,
       relation_products: [],
       relation_forms: [],
+      business_code: params == null ? void 0 : params.business_code,
       ...(params == null ? void 0 : params.extraData) || {}
     };
     let is_deposit = 0;

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

@@ -17,6 +17,7 @@ export interface CommitOrderParams {
         type: 'virtual' | 'appointment_booking';
         platform?: 'pc' | 'h5';
         extraData?: Record<string, any>;
+        business_code?: string;
     };
 }
 /**

package/lib/modules/Product/index.d.ts

@@ -49,5 +49,5 @@ export declare class Product extends BaseModule implements Module {
     getCategories(): ProductCategory[];
     setOtherParams(key: string, value: any): void;
     getOtherParams(): any;
-    getProductType(): "duration" | "session" | "normal";
+    getProductType(): "normal" | "duration" | "session";
 }

package/lib/modules/Summary/utils.js

@@ -409,8 +409,10 @@ var getDiscountAmount = (discounts) => {
   }, new import_decimal.default(0)).toNumber();
 };
 var getMainProductTotal = (item) => {
-  var _a;
+  var _a, _b, _c, _d;
   let total = new import_decimal.default((item == null ? void 0 : item.main_product_selling_price) ?? ((_a = item == null ? void 0 : item.metadata) == null ? void 0 : _a.main_product_selling_price) ?? item.price ?? 0);
+  const mainProductDiscountAmount = getDiscountAmount(((_c = (_b = item == null ? void 0 : item._origin) == null ? void 0 : _b.product) == null ? void 0 : _c.discount_list) || ((_d = item == null ? void 0 : item._originData.product) == null ? void 0 : _d.discount_list) || []);
+  total = total.minus(mainProductDiscountAmount);
   if ((item == null ? void 0 : item.option) && Array.isArray(item == null ? void 0 : item.option)) {
     total = total.add(item == null ? void 0 : item.option.reduce((t, option) => {
       return t.add(new import_decimal.default(option.price || 0).mul(option.num || 1));

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

@@ -358,7 +358,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
     };
     setOtherData(key: string, value: any): void;
     getOtherData(key: string): any;
-    getProductTypeById(id: number): Promise<"duration" | "session" | "normal">;
+    getProductTypeById(id: number): Promise<"normal" | "duration" | "session">;
     /**
      * 提供给 UI 的方法，减轻 UI 层的计算压力，UI 层只需要传递 cartItemId 和 resourceCode 即返回对应的 renderList
      *

package/lib/solution/BookingByStep/index.js

@@ -512,10 +512,11 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
   }
   // 购物车提交订单
   async submitOrder(extraData) {
+    var _a;
     const cartItems = this.store.cart.getItems();
     const newCartItems = (0, import_lodash_es.cloneDeep)(cartItems);
     newCartItems.forEach((item) => {
-      var _a;
+      var _a2;
       if (item._origin.resources && item._origin.resources.length) {
         item._origin.resources = item._origin.resources.map((n) => {
           const newResourcesItem = (0, import_lodash_es.cloneDeep)(n);
@@ -525,7 +526,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
           return { ...newResourcesItem };
         });
         const { currentCapacity, formatCapacity } = (0, import_capacity.getCapacityInfoByCartItem)(item);
-        if (!((_a = item._origin) == null ? void 0 : _a.metadata)) {
+        if (!((_a2 = item._origin) == null ? void 0 : _a2.metadata)) {
           item._origin.metadata = {};
         }
         item._origin.metadata.capacity = formatCapacity;
@@ -543,6 +544,7 @@ var BookingByStepImpl = class extends import_BaseModule.BaseModule {
         cartItems: newCartItems,
         type,
         platform: this.platform,
+        business_code: (_a = this.otherParams) == null ? void 0 : _a.business_code,
         extraData
       }
     });

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

@@ -123,7 +123,7 @@ export declare class BookingTicketImpl extends BaseModule implements Module {
      * 获取当前的客户搜索条件
      * @returns 当前搜索条件
      */
-    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "skip" | "num">;
+    getCurrentCustomerSearchParams(): Omit<import("../../modules").ShopGetCustomerListParams, "num" | "skip">;
     /**
      * 获取客户列表状态（包含滚动加载相关状态）
      * @returns 客户状态

package/package.json

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