@pisell/pisellos 2.2.13 → 2.2.15

package/dist/modules/Customer/index.js

@@ -154,7 +154,7 @@ export var CustomerModule = /*#__PURE__*/function (_BaseModule) {
                 skip: skip,
                 num: num,
                 sort_by: SORT_BY,
-                with: ['latestWalletDetail.wallet', 'contactsInfo'],
+                with: ['latestWalletDetail.wallet'],
                 search_wallet_flag: 1,
                 search_wallet_pass_flag: 1
               }, search && {

package/dist/modules/Order/index.js

@@ -252,11 +252,16 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
     key: "createOrderByCheckout",
     value: (function () {
       var _createOrderByCheckout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(params) {
-        var _params$bookings2, _params$relation_prod2, _params$payments, _params$payments2, _params$bookings3, _params$relation_prod3, _params$payments3;
-        var _orderData$payments, _orderData$bookings, _orderData$relation_p, _orderData$payments2, _orderData$payments3, _orderData$bookings2, _orderData$relation_p2, _orderData$payments4, _orderData$payments5, _response$data, orderData, response;
+        var _params$payments, _params$bookings2, _params$relation_prod2, _params$payments2, _params$payments3, _params$bookings3, _params$relation_prod3, _params$payments4;
+        var onlineStorePaymentCodeList, _orderData$payments, _orderData$bookings, _orderData$relation_p, _orderData$payments2, _orderData$payments3, _orderData$bookings2, _orderData$relation_p2, _orderData$payments4, _orderData$payments5, _response$data, orderData, response;
         return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
+              // 过滤掉由在线店铺下单的 payment 支付数据
+              onlineStorePaymentCodeList = ['WXPAY', 'WECHAT', 'ALIPAY', 'APPLE_PAY', 'CREDIT_CARD_3DS', 'CREDIT_CARD_TOKEN', 'GOOGLE_PAY', 'GOOGLE_PAY_3DS', 'CREDIT_CARD'];
+              params.payments = (_params$payments = params.payments) === null || _params$payments === void 0 ? void 0 : _params$payments.filter(function (p) {
+                return !onlineStorePaymentCodeList.includes(p.code);
+              });
               this.logInfo('createOrderByCheckout called', {
                 type: params.type,
                 platform: params.platform,
@@ -264,14 +269,14 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 customer_id: params.customer_id,
                 bookingsCount: ((_params$bookings2 = params.bookings) === null || _params$bookings2 === void 0 ? void 0 : _params$bookings2.length) || 0,
                 relationProductsCount: ((_params$relation_prod2 = params.relation_products) === null || _params$relation_prod2 === void 0 ? void 0 : _params$relation_prod2.length) || 0,
-                paymentsCount: ((_params$payments = params.payments) === null || _params$payments === void 0 ? void 0 : _params$payments.length) || 0,
+                paymentsCount: ((_params$payments2 = params.payments) === null || _params$payments2 === void 0 ? void 0 : _params$payments2.length) || 0,
                 depositAmount: params.deposit_amount,
                 productTaxFee: params.product_tax_fee,
                 note: params.note,
                 scheduleDate: params.schedule_date,
                 hasOrderId: !!params.order_id,
                 orderIdIncluded: params.order_id,
-                paymentMethods: ((_params$payments2 = params.payments) === null || _params$payments2 === void 0 ? void 0 : _params$payments2.map(function (p) {
+                paymentMethods: ((_params$payments3 = params.payments) === null || _params$payments3 === void 0 ? void 0 : _params$payments3.map(function (p) {
                   return p.code;
                 })) || []
               });
@@ -282,9 +287,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 customer_id: params.customer_id,
                 bookingsCount: ((_params$bookings3 = params.bookings) === null || _params$bookings3 === void 0 ? void 0 : _params$bookings3.length) || 0,
                 relationProductsCount: ((_params$relation_prod3 = params.relation_products) === null || _params$relation_prod3 === void 0 ? void 0 : _params$relation_prod3.length) || 0,
-                paymentsCount: ((_params$payments3 = params.payments) === null || _params$payments3 === void 0 ? void 0 : _params$payments3.length) || 0
+                paymentsCount: ((_params$payments4 = params.payments) === null || _params$payments4 === void 0 ? void 0 : _params$payments4.length) || 0
               });
-              _context3.prev = 2;
+              _context3.prev = 4;
               // 构建订单数据，设置默认值并允许 params 覆盖
               orderData = _objectSpread({
                 sales_channel: 'my_pisel',
@@ -348,9 +353,9 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
               });
 
               // 调用后端接口
-              _context3.next = 10;
+              _context3.next = 12;
               return this.request.post('/order/checkout', orderData);
-            case 10:
+            case 12:
               response = _context3.sent;
               this.logInfo('Order API called successfully', {
                 response: response
@@ -360,19 +365,19 @@ export var OrderModule = /*#__PURE__*/function (_BaseModule) {
                 hasOrderId: !!(response !== null && response !== void 0 && (_response$data = response.data) !== null && _response$data !== void 0 && _response$data.order_id || response !== null && response !== void 0 && response.order_id)
               });
               return _context3.abrupt("return", response);
-            case 16:
-              _context3.prev = 16;
-              _context3.t0 = _context3["catch"](2);
+            case 18:
+              _context3.prev = 18;
+              _context3.t0 = _context3["catch"](4);
               console.error('[Order] createOrderByCheckout 创建订单失败:', _context3.t0);
               this.logInfo('Order API called failed', {
                 error: _context3.t0 instanceof Error ? _context3.t0.message : String(_context3.t0)
               });
               throw _context3.t0;
-            case 21:
+            case 23:
             case "end":
               return _context3.stop();
           }
-        }, _callee3, this, [[2, 16]]);
+        }, _callee3, this, [[4, 18]]);
       }));
       function createOrderByCheckout(_x4) {
         return _createOrderByCheckout.apply(this, arguments);

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

@@ -50,6 +50,7 @@ export declare class PaymentModule extends BaseModule implements Module, Payment
      *
      */
     private registerNetworkHandlers;
+    private filterPayMethods;
     /**
      * 获取支付方式列表
      */