@pisell/pisellos 2.3.156 → 2.3.158
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/modules/ProductList/index.js +1 -1
- package/dist/server/index.js +6 -4
- package/dist/solution/BookingByStep/index.d.ts +1 -1
- package/lib/model/strategy/adapter/promotion/index.js +46 -1
- package/lib/modules/ProductList/index.js +1 -1
- package/lib/server/index.js +5 -3
- package/lib/solution/BookingByStep/index.d.ts +1 -1
- package/package.json +1 -1
|
@@ -227,7 +227,7 @@ export var ProductList = /*#__PURE__*/function (_BaseModule) {
|
|
|
227
227
|
online_store: 'online-store',
|
|
228
228
|
scan_to_order: 'online-store',
|
|
229
229
|
'scan-to-order': 'online-store',
|
|
230
|
-
scan_to_order_2: '
|
|
230
|
+
scan_to_order_2: 'online-store',
|
|
231
231
|
scan_to_order_3: 'scantoorder3'
|
|
232
232
|
};
|
|
233
233
|
rawApplicationCode = (_this$otherParams = this.otherParams) === null || _this$otherParams === void 0 ? void 0 : _this$otherParams.channel;
|
package/dist/server/index.js
CHANGED
|
@@ -8524,11 +8524,13 @@ var Server = /*#__PURE__*/function () {
|
|
|
8524
8524
|
});
|
|
8525
8525
|
|
|
8526
8526
|
// 使用 filterOrders 进行过滤、排序、分页
|
|
8527
|
-
result = filterOrders(rawList, data);
|
|
8528
|
-
result.list.
|
|
8527
|
+
result = filterOrders(rawList, data); // filterOrders retains store object references; hide pending only in the list response.
|
|
8528
|
+
result.list = result.list.map(function (order) {
|
|
8529
8529
|
var _order$payments;
|
|
8530
|
-
|
|
8531
|
-
|
|
8530
|
+
return _objectSpread(_objectSpread({}, order), {}, {
|
|
8531
|
+
payments: (_order$payments = order.payments) === null || _order$payments === void 0 ? void 0 : _order$payments.filter(function (payment) {
|
|
8532
|
+
return !isPendingOrderPayment(payment);
|
|
8533
|
+
})
|
|
8532
8534
|
});
|
|
8533
8535
|
});
|
|
8534
8536
|
this.logInfo('computeOrderQueryResult: 过滤结果', {
|
|
@@ -328,7 +328,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
|
|
|
328
328
|
date: string;
|
|
329
329
|
status: string;
|
|
330
330
|
week: string;
|
|
331
|
-
weekNum: 0 |
|
|
331
|
+
weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
|
|
332
332
|
}[]>;
|
|
333
333
|
submitTimeSlot(timeSlots: TimeSliceItem): void;
|
|
334
334
|
private getScheduleDataByIds;
|
|
@@ -1 +1,46 @@
|
|
|
1
|
-
"use strict";
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
Object.defineProperty(exports, "BUY_X_GET_Y_FREE_STRATEGY", {
|
|
7
|
+
enumerable: true,
|
|
8
|
+
get: function () {
|
|
9
|
+
return _examples.BUY_X_GET_Y_FREE_STRATEGY;
|
|
10
|
+
}
|
|
11
|
+
});
|
|
12
|
+
Object.defineProperty(exports, "ITEM_REWARD_STRATEGY", {
|
|
13
|
+
enumerable: true,
|
|
14
|
+
get: function () {
|
|
15
|
+
return _examples.ITEM_REWARD_STRATEGY;
|
|
16
|
+
}
|
|
17
|
+
});
|
|
18
|
+
Object.defineProperty(exports, "PromotionAdapter", {
|
|
19
|
+
enumerable: true,
|
|
20
|
+
get: function () {
|
|
21
|
+
return _adapter.PromotionAdapter;
|
|
22
|
+
}
|
|
23
|
+
});
|
|
24
|
+
Object.defineProperty(exports, "PromotionEvaluator", {
|
|
25
|
+
enumerable: true,
|
|
26
|
+
get: function () {
|
|
27
|
+
return _evaluator.PromotionEvaluator;
|
|
28
|
+
}
|
|
29
|
+
});
|
|
30
|
+
Object.defineProperty(exports, "X_ITEMS_FOR_Y_PRICE_STRATEGY", {
|
|
31
|
+
enumerable: true,
|
|
32
|
+
get: function () {
|
|
33
|
+
return _examples.X_ITEMS_FOR_Y_PRICE_STRATEGY;
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
Object.defineProperty(exports, "default", {
|
|
37
|
+
enumerable: true,
|
|
38
|
+
get: function () {
|
|
39
|
+
return _adapter.default;
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
var _evaluator = require("./evaluator");
|
|
43
|
+
var _adapter = _interopRequireWildcard(require("./adapter"));
|
|
44
|
+
var _examples = require("./examples");
|
|
45
|
+
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
46
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
@@ -125,7 +125,7 @@ class ProductList extends _BaseModule.BaseModule {
|
|
|
125
125
|
online_store: 'online-store',
|
|
126
126
|
scan_to_order: 'online-store',
|
|
127
127
|
'scan-to-order': 'online-store',
|
|
128
|
-
scan_to_order_2: '
|
|
128
|
+
scan_to_order_2: 'online-store',
|
|
129
129
|
scan_to_order_3: 'scantoorder3'
|
|
130
130
|
};
|
|
131
131
|
const rawApplicationCode = this.otherParams?.channel;
|
package/lib/server/index.js
CHANGED
|
@@ -5858,9 +5858,11 @@ class Server {
|
|
|
5858
5858
|
|
|
5859
5859
|
// 使用 filterOrders 进行过滤、排序、分页
|
|
5860
5860
|
const result = (0, _filterOrders.filterOrders)(rawList, data);
|
|
5861
|
-
|
|
5862
|
-
|
|
5863
|
-
|
|
5861
|
+
// filterOrders retains store object references; hide pending only in the list response.
|
|
5862
|
+
result.list = result.list.map(order => ({
|
|
5863
|
+
...order,
|
|
5864
|
+
payments: order.payments?.filter(payment => !(0, _paymentUtils.isPendingOrderPayment)(payment))
|
|
5865
|
+
}));
|
|
5864
5866
|
this.logInfo('computeOrderQueryResult: 过滤结果', {
|
|
5865
5867
|
rawCount: rawList.length,
|
|
5866
5868
|
filteredCount: result.count,
|
|
@@ -328,7 +328,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
|
|
|
328
328
|
date: string;
|
|
329
329
|
status: string;
|
|
330
330
|
week: string;
|
|
331
|
-
weekNum: 0 |
|
|
331
|
+
weekNum: 0 | 2 | 1 | 3 | 5 | 4 | 6;
|
|
332
332
|
}[]>;
|
|
333
333
|
submitTimeSlot(timeSlots: TimeSliceItem): void;
|
|
334
334
|
private getScheduleDataByIds;
|