@pisell/pisellos 0.0.387 → 0.0.389

package/dist/modules/Payment/cash.js

@@ -38,7 +38,7 @@ export var CashPaymentImpl = /*#__PURE__*/function () {
               paymentItem = {
                 amount: amount.toString(),
                 code: cashMethod.code,
-                id: cashMethod.id,
+                custom_payment_id: cashMethod.id,
                 name: cashMethod.name,
                 type: cashMethod.type,
                 voucher_id: ''

package/dist/modules/Payment/eftpos.js

@@ -38,7 +38,7 @@ export var EftposPaymentImpl = /*#__PURE__*/function () {
               paymentItem = {
                 amount: amount.toString(),
                 code: eftposMethod.code,
-                id: eftposMethod.id,
+                custom_payment_id: eftposMethod.id,
                 name: eftposMethod.name,
                 type: eftposMethod.type,
                 voucher_id: ''

package/dist/modules/Payment/index.js

@@ -1170,7 +1170,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
               currentTime = formatDateTime(new Date());
               newPaymentItem = {
                 uuid: paymentUuid,
-                id: paymentItem.id || 0,
+                custom_payment_id: paymentItem.custom_payment_id || 0,
                 name: paymentItem.name,
                 code: paymentItem.code,
                 type: paymentItem.type,
@@ -1697,7 +1697,7 @@ export var PaymentModule = /*#__PURE__*/function (_BaseModule) {
                     uuid: payment.uuid,
                     amount: payment.amount,
                     code: payment.code,
-                    id: payment.id,
+                    custom_payment_id: payment.custom_payment_id,
                     name: payment.name,
                     type: payment.type,
                     voucher_id: payment.voucher_id,

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

@@ -96,7 +96,7 @@ export interface PaymentItem {
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
     code: string;
     /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-    id: number;
+    custom_payment_id: number;
     /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
     name: string;
     /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
@@ -225,7 +225,7 @@ export interface PaymentItemInput {
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
     code: string;
     /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-    id: number;
+    custom_payment_id: number;
     /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
     name: string;
     /** 支付类型type，跟支付列表上对应的支付方式保持一致 */

package/dist/modules/Payment/walletpass.js

@@ -644,7 +644,7 @@ export var WalletPassPaymentImpl = /*#__PURE__*/function () {
               paymentItem = {
                 amount: amount.toString(),
                 code: walletMethod.code,
-                id: walletMethod.id,
+                custom_payment_id: walletMethod.id,
                 name: walletMethod.name,
                 type: walletMethod.type,
                 voucher_id: voucherId || ''

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

@@ -16,7 +16,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     getRulesList(): Rules[];
     getWalletPassEvaluator(): import("../..").WalletPassEvaluator | undefined;
     private checkHolderMatch;
-    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, orderTotalAmount, holders, }: {
+    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, orderTotalAmount, holders, isFormSubject, }: {
         oldDiscountList: Discount[];
         newDiscountList: Discount[];
         productList: any[];
@@ -24,18 +24,20 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         holders: {
             form_record_id: number;
         }[];
+        isFormSubject: boolean;
     }): {
         isAvailable: boolean;
         discountList: Discount[];
         productList: any[];
     };
-    calcDiscount({ discountList, productList, orderTotalAmount, holders, }: {
+    calcDiscount({ discountList, productList, orderTotalAmount, holders, isFormSubject, }: {
         discountList: Discount[];
         productList: any[];
         orderTotalAmount: number;
         holders: {
             form_record_id: number;
         }[];
+        isFormSubject: boolean;
     }, options?: {
         isSelected?: boolean;
         discountId?: number;

package/dist/modules/Rules/index.js

@@ -130,7 +130,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         newDiscountList = _ref.newDiscountList,
         productList = _ref.productList,
         orderTotalAmount = _ref.orderTotalAmount,
-        holders = _ref.holders;
+        holders = _ref.holders,
+        isFormSubject = _ref.isFormSubject;
       // 首先检查是否有新的优惠券可应用
       if (!newDiscountList || newDiscountList.length === 0) {
         return {
@@ -162,7 +163,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
         discountList: mergedDiscountList,
         productList: _toConsumableArray(productList),
         orderTotalAmount: orderTotalAmount,
-        holders: holders
+        holders: holders,
+        isFormSubject: isFormSubject
       }, {
         scan: true
       });
@@ -201,7 +203,8 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
       var discountList = _ref2.discountList,
         productList = _ref2.productList,
         orderTotalAmount = _ref2.orderTotalAmount,
-        holders = _ref2.holders;
+        holders = _ref2.holders,
+        isFormSubject = _ref2.isFormSubject;
       // 识别出来是不是在编辑的界面里又新增了商品
       // 这种情况下，如果有可用的优惠券，也会自动勾选上
       var isEditModeAddNewProduct = productList.find(function (n) {
@@ -498,7 +501,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 拿到discount配置的holder信息 product信息 product.holder 加在 isLimitedProduct
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
           var isHolderMatch = _this3.checkHolderMatch(discount, {
-            isNeedHolder: _tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.isNeedHolder,
+            isNeedHolder: isFormSubject && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
           }, holders);
           var timeLimit = true;
@@ -645,7 +648,7 @@ export var RulesModule = /*#__PURE__*/function (_BaseModule) {
           // 拿到discount配置的holder信息 product信息 product.holder 不可用return false
           var _tempVar = (flatItem === null || flatItem === void 0 ? void 0 : flatItem.type) === 'bundle' ? flatItem === null || flatItem === void 0 ? void 0 : flatItem.parentProduct : flatItem === null || flatItem === void 0 ? void 0 : flatItem.product;
           var isHolderMatch = _this3.checkHolderMatch(discount, {
-            isNeedHolder: _tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.isNeedHolder,
+            isNeedHolder: isFormSubject && !(_tempVar !== null && _tempVar !== void 0 && _tempVar.isNormalProduct),
             holder_id: (_tempVar === null || _tempVar === void 0 ? void 0 : _tempVar.holder_id) || product.holder_id
           }, holders);
           // 如果 holder 不匹配，则不适用

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

@@ -26,6 +26,7 @@ export interface RulesModuleAPI {
         holders: {
             form_record_id: number;
         }[];
+        isFormSubject: boolean;
     }) => DiscountResult;
 }
 type ProductDetail = {

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

@@ -308,7 +308,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -25,6 +25,10 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     setHolders(holders: {
         form_record_id: number;
     }[]): void;
+    setBookingSubject(bookingSubject: {
+        type?: 'form' | 'customer';
+        [key: string]: any;
+    }): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];

package/dist/solution/ShopDiscount/index.js

@@ -55,7 +55,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
       currentBookingTime: "",
       filteredDiscountList: [],
       orderTotalAmount: 0,
-      holders: []
+      holders: [],
+      bookingSubject: undefined
     };
     return _this;
   }
@@ -300,11 +301,17 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     value: function setHolders(holders) {
       this.store.holders = holders;
     }
+  }, {
+    key: "setBookingSubject",
+    value: function setBookingSubject(bookingSubject) {
+      this.store.bookingSubject = bookingSubject;
+    }
 
     // 计算优惠券
   }, {
     key: "calcDiscount",
     value: function calcDiscount(productList, options) {
+      var _this$store$bookingSu;
       this.store.productList = productList;
       var rulesModule = this.core.getModule("".concat(this.name, "_rules"));
       if (!rulesModule) {
@@ -317,7 +324,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
           productList: productList,
           discountList: this.getDiscountList(),
           orderTotalAmount: this.store.orderTotalAmount || 0,
-          holders: this.store.holders || []
+          holders: this.store.holders || [],
+          isFormSubject: ((_this$store$bookingSu = this.store.bookingSubject) === null || _this$store$bookingSu === void 0 ? void 0 : _this$store$bookingSu.type) === 'form'
         }, options) || {
           productList: productList,
           discountList: this.getDiscountList()
@@ -390,7 +398,7 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
     key: "scanCode",
     value: function () {
       var _scanCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5(code, customerId) {
-        var _this$store$discount3, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
+        var _this$store$discount3, _this$store$bookingSu2, resultDiscountList, rulesModule, withScanList, currentSelectedDiscountList, _ref2, newProductList, newDiscountList, isAvailable, _this$options$otherPa6;
         return _regeneratorRuntime().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
@@ -457,7 +465,8 @@ export var ShopDiscountImpl = /*#__PURE__*/function (_BaseModule) {
                 oldDiscountList: this.getDiscountList(),
                 newDiscountList: withScanList,
                 orderTotalAmount: this.store.orderTotalAmount || 0,
-                holders: this.store.holders || []
+                holders: this.store.holders || [],
+                isFormSubject: ((_this$store$bookingSu2 = this.store.bookingSubject) === null || _this$store$bookingSu2 === void 0 ? void 0 : _this$store$bookingSu2.type) === 'form'
               }) || {
                 isAvailable: false,
                 productList: this.store.productList || [],

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

@@ -32,6 +32,10 @@ export interface ShopDiscountState {
         form_id?: number;
         main_field?: string;
     }[];
+    bookingSubject?: {
+        type?: 'form' | 'customer';
+        [key: string]: any;
+    };
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

package/lib/modules/Payment/cash.js

@@ -35,7 +35,7 @@ var CashPaymentImpl = class {
     const paymentItem = {
       amount: amount.toString(),
       code: cashMethod.code,
-      id: cashMethod.id,
+      custom_payment_id: cashMethod.id,
       name: cashMethod.name,
       type: cashMethod.type,
       voucher_id: ""

package/lib/modules/Payment/eftpos.js

@@ -34,7 +34,7 @@ var EftposPaymentImpl = class {
     const paymentItem = {
       amount: amount.toString(),
       code: eftposMethod.code,
-      id: eftposMethod.id,
+      custom_payment_id: eftposMethod.id,
       name: eftposMethod.name,
       type: eftposMethod.type,
       voucher_id: ""

package/lib/modules/Payment/index.js

@@ -591,7 +591,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
       const currentTime = formatDateTime(/* @__PURE__ */ new Date());
       const newPaymentItem = {
         uuid: paymentUuid,
-        id: paymentItem.id || 0,
+        custom_payment_id: paymentItem.custom_payment_id || 0,
         name: paymentItem.name,
         code: paymentItem.code,
         type: paymentItem.type,
@@ -858,7 +858,7 @@ var PaymentModule = class extends import_BaseModule.BaseModule {
           uuid: payment.uuid,
           amount: payment.amount,
           code: payment.code,
-          id: payment.id,
+          custom_payment_id: payment.custom_payment_id,
           name: payment.name,
           type: payment.type,
           voucher_id: payment.voucher_id,

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

@@ -96,7 +96,7 @@ export interface PaymentItem {
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
     code: string;
     /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-    id: number;
+    custom_payment_id: number;
     /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
     name: string;
     /** 支付类型type，跟支付列表上对应的支付方式保持一致 */
@@ -225,7 +225,7 @@ export interface PaymentItemInput {
     /** 支付类型，跟支付列表上对应的支付方式保持一致 */
     code: string;
     /** 支付类型id，跟支付列表上对应的支付方式保持一致 */
-    id: number;
+    custom_payment_id: number;
     /** 支付类型名称，跟支付列表上对应的支付方式保持一致 */
     name: string;
     /** 支付类型type，跟支付列表上对应的支付方式保持一致 */

package/lib/modules/Payment/walletpass.js

@@ -455,7 +455,7 @@ var WalletPassPaymentImpl = class {
     const paymentItem = {
       amount: amount.toString(),
       code: walletMethod.code,
-      id: walletMethod.id,
+      custom_payment_id: walletMethod.id,
       name: walletMethod.name,
       type: walletMethod.type,
       voucher_id: voucherId || ""

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

@@ -16,7 +16,7 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
     getRulesList(): Rules[];
     getWalletPassEvaluator(): import("../..").WalletPassEvaluator | undefined;
     private checkHolderMatch;
-    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, orderTotalAmount, holders, }: {
+    isDiscountListAvailable({ oldDiscountList, newDiscountList, productList, orderTotalAmount, holders, isFormSubject, }: {
         oldDiscountList: Discount[];
         newDiscountList: Discount[];
         productList: any[];
@@ -24,18 +24,20 @@ export declare class RulesModule extends BaseModule implements Module, RulesModu
         holders: {
             form_record_id: number;
         }[];
+        isFormSubject: boolean;
     }): {
         isAvailable: boolean;
         discountList: Discount[];
         productList: any[];
     };
-    calcDiscount({ discountList, productList, orderTotalAmount, holders, }: {
+    calcDiscount({ discountList, productList, orderTotalAmount, holders, isFormSubject, }: {
         discountList: Discount[];
         productList: any[];
         orderTotalAmount: number;
         holders: {
             form_record_id: number;
         }[];
+        isFormSubject: boolean;
     }, options?: {
         isSelected?: boolean;
         discountId?: number;

package/lib/modules/Rules/index.js

@@ -81,7 +81,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     newDiscountList,
     productList,
     orderTotalAmount,
-    holders
+    holders,
+    isFormSubject
   }) {
     if (!newDiscountList || newDiscountList.length === 0) {
       return {
@@ -113,7 +114,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         discountList: mergedDiscountList,
         productList: [...productList],
         orderTotalAmount,
-        holders
+        holders,
+        isFormSubject
       },
       {
         scan: true
@@ -145,7 +147,8 @@ var RulesModule = class extends import_BaseModule.BaseModule {
     discountList,
     productList,
     orderTotalAmount,
-    holders
+    holders,
+    isFormSubject
   }, options) {
     const isEditModeAddNewProduct = productList.find((n) => n.booking_id) && productList.find((n) => !n.booking_id);
     const editModeDiscount = [];
@@ -345,7 +348,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const isHolderMatch = this.checkHolderMatch(
           discount,
           {
-            isNeedHolder: _tempVar == null ? void 0 : _tempVar.isNeedHolder,
+            isNeedHolder: isFormSubject && !(_tempVar == null ? void 0 : _tempVar.isNormalProduct),
             holder_id: (_tempVar == null ? void 0 : _tempVar.holder_id) || product.holder_id
           },
           holders
@@ -472,7 +475,7 @@ var RulesModule = class extends import_BaseModule.BaseModule {
         const isHolderMatch = this.checkHolderMatch(
           discount,
           {
-            isNeedHolder: _tempVar == null ? void 0 : _tempVar.isNeedHolder,
+            isNeedHolder: isFormSubject && !(_tempVar == null ? void 0 : _tempVar.isNormalProduct),
             holder_id: (_tempVar == null ? void 0 : _tempVar.holder_id) || product.holder_id
           },
           holders

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

@@ -26,6 +26,7 @@ export interface RulesModuleAPI {
         holders: {
             form_record_id: number;
         }[];
+        isFormSubject: boolean;
     }) => DiscountResult;
 }
 type ProductDetail = {

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

@@ -308,7 +308,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
         date: string;
         status: string;
         week: string;
-        weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
+        weekNum: 0 | 1 | 2 | 3 | 4 | 5 | 6;
     }[]>;
     submitTimeSlot(timeSlots: TimeSliceItem): void;
     private getScheduleDataByIds;

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

@@ -25,6 +25,10 @@ export declare class ShopDiscountImpl extends BaseModule implements Module {
     setHolders(holders: {
         form_record_id: number;
     }[]): void;
+    setBookingSubject(bookingSubject: {
+        type?: 'form' | 'customer';
+        [key: string]: any;
+    }): void;
     calcDiscount(productList: Record<string, any>[], options?: SetDiscountSelectedParams): {
         productList: Record<string, any>[];
         discountList: Discount[];

package/lib/solution/ShopDiscount/index.js

@@ -55,7 +55,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
       currentBookingTime: "",
       filteredDiscountList: [],
       orderTotalAmount: 0,
-      holders: []
+      holders: [],
+      bookingSubject: void 0
     };
   }
   // =========== 生命周期方法 ===========
@@ -200,8 +201,12 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   setHolders(holders) {
     this.store.holders = holders;
   }
+  setBookingSubject(bookingSubject) {
+    this.store.bookingSubject = bookingSubject;
+  }
   // 计算优惠券
   calcDiscount(productList, options) {
+    var _a;
     this.store.productList = productList;
     const rulesModule = this.core.getModule(`${this.name}_rules`);
     if (!rulesModule) {
@@ -212,7 +217,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         productList,
         discountList: this.getDiscountList(),
         orderTotalAmount: this.store.orderTotalAmount || 0,
-        holders: this.store.holders || []
+        holders: this.store.holders || [],
+        isFormSubject: ((_a = this.store.bookingSubject) == null ? void 0 : _a.type) === "form"
       },
       options
     ) || { productList, discountList: this.getDiscountList() };
@@ -259,7 +265,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
   }
   // 扫码输入code
   async scanCode(code, customerId) {
-    var _a, _b;
+    var _a, _b, _c;
     try {
       const resultDiscountList = await ((_a = this.store.discount) == null ? void 0 : _a.batchSearch(code, customerId)) || [];
       const rulesModule = this.store.rules;
@@ -303,7 +309,8 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         oldDiscountList: this.getDiscountList(),
         newDiscountList: withScanList,
         orderTotalAmount: this.store.orderTotalAmount || 0,
-        holders: this.store.holders || []
+        holders: this.store.holders || [],
+        isFormSubject: ((_b = this.store.bookingSubject) == null ? void 0 : _b.type) === "form"
       }) || {
         isAvailable: false,
         productList: this.store.productList || [],
@@ -313,7 +320,7 @@ var ShopDiscountImpl = class extends import_BaseModule.BaseModule {
         this.setDiscountList(newDiscountList || []);
         this.store.originalDiscountList = newDiscountList || [];
         this.setProductList(newProductList || []);
-        if (this.isWalkIn() && resultDiscountList.length && ((_b = this.options.otherParams) == null ? void 0 : _b.platform) === "shop") {
+        if (this.isWalkIn() && resultDiscountList.length && ((_c = this.options.otherParams) == null ? void 0 : _c.platform) === "shop") {
           await this.getCustomerWallet(
             resultDiscountList[0].customer_id
           );

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

@@ -32,6 +32,10 @@ export interface ShopDiscountState {
         form_id?: number;
         main_field?: string;
     }[];
+    bookingSubject?: {
+        type?: 'form' | 'customer';
+        [key: string]: any;
+    };
 }
 export interface SetDiscountSelectedParams {
     discountId: number;

package/package.json

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