@pisell/pisellos 2.3.15 → 2.3.16
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/server/index.d.ts +2 -2
- package/dist/server/index.js +184 -191
- package/dist/solution/BookingTicket/index.d.ts +1 -1
- package/dist/solution/BookingTicket/index.js +17 -26
- package/lib/server/index.d.ts +2 -2
- package/lib/server/index.js +55 -41
- package/lib/solution/BookingTicket/index.d.ts +1 -1
- package/lib/solution/BookingTicket/index.js +12 -23
- package/package.json +1 -1
package/dist/server/index.d.ts
CHANGED
|
@@ -431,9 +431,9 @@ declare class Server {
|
|
|
431
431
|
private shouldLookupLocalPrintOrder;
|
|
432
432
|
private getLocalPrintOrderLookup;
|
|
433
433
|
private handleLocalPrintOrder;
|
|
434
|
-
private
|
|
434
|
+
private handleMachinecodeBatchMeta;
|
|
435
435
|
private resolveMachinecodeBatchMetadataLookup;
|
|
436
|
-
private
|
|
436
|
+
private syncMachinecodeRedeemStatusToLocalOrder;
|
|
437
437
|
private handleOrderCheckoutSubmit;
|
|
438
438
|
private handleSyncCheckoutSubmit;
|
|
439
439
|
private handlePendingSyncCheckoutOrder;
|
package/dist/server/index.js
CHANGED
|
@@ -1069,24 +1069,26 @@ var Server = /*#__PURE__*/function () {
|
|
|
1069
1069
|
return _ref39.apply(this, arguments);
|
|
1070
1070
|
};
|
|
1071
1071
|
}());
|
|
1072
|
-
_defineProperty(this, "
|
|
1072
|
+
_defineProperty(this, "handleMachinecodeBatchMeta", /*#__PURE__*/function () {
|
|
1073
1073
|
var _ref43 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee17(_ref42) {
|
|
1074
1074
|
var _this$resolveMachinec, _this$app2;
|
|
1075
|
-
var data, title, backendPath,
|
|
1075
|
+
var data, title, backendPath, ids, status, message, _response$code, _response$status, _response$message, _response$data2, response, backendError, _backendError$code, _backendError$status, _backendError$message, _backendError$data, _message;
|
|
1076
1076
|
return _regeneratorRuntime().wrap(function _callee17$(_context17) {
|
|
1077
1077
|
while (1) switch (_context17.prev = _context17.next) {
|
|
1078
1078
|
case 0:
|
|
1079
1079
|
data = _ref42.data;
|
|
1080
|
-
title = '
|
|
1081
|
-
backendPath = '/shop/machinecode/batch
|
|
1082
|
-
|
|
1080
|
+
title = 'handleMachinecodeBatchMeta';
|
|
1081
|
+
backendPath = '/shop/machinecode/batch';
|
|
1082
|
+
ids = Array.isArray(data === null || data === void 0 ? void 0 : data.ids) ? data.ids : [];
|
|
1083
|
+
status = data === null || data === void 0 ? void 0 : data.status;
|
|
1083
1084
|
_this.logInfo("".concat(title, ": \u5F00\u59CB\u5904\u7406"), {
|
|
1084
1085
|
backendPath: backendPath,
|
|
1085
|
-
batchSize:
|
|
1086
|
+
batchSize: ids.length,
|
|
1087
|
+
status: status,
|
|
1086
1088
|
order_lookup: (_this$resolveMachinec = _this.resolveMachinecodeBatchMetadataLookup(data)) !== null && _this$resolveMachinec !== void 0 ? _this$resolveMachinec : null
|
|
1087
1089
|
});
|
|
1088
|
-
if (!(
|
|
1089
|
-
_context17.next =
|
|
1090
|
+
if (!(ids.length === 0)) {
|
|
1091
|
+
_context17.next = 8;
|
|
1090
1092
|
break;
|
|
1091
1093
|
}
|
|
1092
1094
|
return _context17.abrupt("return", {
|
|
@@ -1095,18 +1097,29 @@ var Server = /*#__PURE__*/function () {
|
|
|
1095
1097
|
message: '',
|
|
1096
1098
|
data: []
|
|
1097
1099
|
});
|
|
1098
|
-
case
|
|
1099
|
-
|
|
1100
|
-
|
|
1101
|
-
|
|
1100
|
+
case 8:
|
|
1101
|
+
if (!(status !== 'used' && status !== 'unused')) {
|
|
1102
|
+
_context17.next = 10;
|
|
1103
|
+
break;
|
|
1104
|
+
}
|
|
1105
|
+
return _context17.abrupt("return", {
|
|
1106
|
+
code: 400,
|
|
1107
|
+
status: false,
|
|
1108
|
+
message: '无效的核销状态',
|
|
1109
|
+
data: null
|
|
1110
|
+
});
|
|
1102
1111
|
case 10:
|
|
1103
|
-
_context17.
|
|
1112
|
+
_context17.prev = 10;
|
|
1113
|
+
_context17.next = 13;
|
|
1114
|
+
return _this.syncMachinecodeRedeemStatusToLocalOrder(data, ids, status);
|
|
1115
|
+
case 13:
|
|
1116
|
+
_context17.next = 20;
|
|
1104
1117
|
break;
|
|
1105
|
-
case
|
|
1106
|
-
_context17.prev =
|
|
1107
|
-
_context17.t0 = _context17["catch"](
|
|
1118
|
+
case 15:
|
|
1119
|
+
_context17.prev = 15;
|
|
1120
|
+
_context17.t0 = _context17["catch"](10);
|
|
1108
1121
|
message = _this.getUnknownErrorMessage(_context17.t0);
|
|
1109
|
-
_this.logError("".concat(title, ": \u672C\u5730\u8BA2\u5355
|
|
1122
|
+
_this.logError("".concat(title, ": \u672C\u5730\u8BA2\u5355\u6838\u9500\u72B6\u6001\u66F4\u65B0\u5931\u8D25"), {
|
|
1110
1123
|
error: message,
|
|
1111
1124
|
error_detail: _this.normalizeUnknownError(_context17.t0)
|
|
1112
1125
|
});
|
|
@@ -1116,9 +1129,9 @@ var Server = /*#__PURE__*/function () {
|
|
|
1116
1129
|
message: message,
|
|
1117
1130
|
data: null
|
|
1118
1131
|
});
|
|
1119
|
-
case
|
|
1132
|
+
case 20:
|
|
1120
1133
|
if ((_this$app2 = _this.app) !== null && _this$app2 !== void 0 && (_this$app2 = _this$app2.request) !== null && _this$app2 !== void 0 && _this$app2.post) {
|
|
1121
|
-
_context17.next =
|
|
1134
|
+
_context17.next = 23;
|
|
1122
1135
|
break;
|
|
1123
1136
|
}
|
|
1124
1137
|
_this.logError("".concat(title, ": app.request \u4E0D\u53EF\u7528"), {
|
|
@@ -1130,16 +1143,17 @@ var Server = /*#__PURE__*/function () {
|
|
|
1130
1143
|
message: 'app.request 不可用',
|
|
1131
1144
|
data: null
|
|
1132
1145
|
});
|
|
1133
|
-
case
|
|
1134
|
-
_context17.prev =
|
|
1135
|
-
_context17.next =
|
|
1146
|
+
case 23:
|
|
1147
|
+
_context17.prev = 23;
|
|
1148
|
+
_context17.next = 26;
|
|
1136
1149
|
return _this.app.request.post(backendPath, {
|
|
1137
|
-
|
|
1150
|
+
ids: ids,
|
|
1151
|
+
status: status
|
|
1138
1152
|
}, {
|
|
1139
1153
|
isShopApi: true,
|
|
1140
1154
|
customToast: function customToast() {}
|
|
1141
1155
|
});
|
|
1142
|
-
case
|
|
1156
|
+
case 26:
|
|
1143
1157
|
response = _context17.sent;
|
|
1144
1158
|
return _context17.abrupt("return", {
|
|
1145
1159
|
code: (_response$code = response === null || response === void 0 ? void 0 : response.code) !== null && _response$code !== void 0 ? _response$code : 200,
|
|
@@ -1147,12 +1161,12 @@ var Server = /*#__PURE__*/function () {
|
|
|
1147
1161
|
message: (_response$message = response === null || response === void 0 ? void 0 : response.message) !== null && _response$message !== void 0 ? _response$message : '',
|
|
1148
1162
|
data: (_response$data2 = response === null || response === void 0 ? void 0 : response.data) !== null && _response$data2 !== void 0 ? _response$data2 : response
|
|
1149
1163
|
});
|
|
1150
|
-
case
|
|
1151
|
-
_context17.prev =
|
|
1152
|
-
_context17.t1 = _context17["catch"](
|
|
1164
|
+
case 30:
|
|
1165
|
+
_context17.prev = 30;
|
|
1166
|
+
_context17.t1 = _context17["catch"](23);
|
|
1153
1167
|
backendError = _this.extractBackendErrorResponse(_context17.t1);
|
|
1154
1168
|
if (!backendError) {
|
|
1155
|
-
_context17.next =
|
|
1169
|
+
_context17.next = 35;
|
|
1156
1170
|
break;
|
|
1157
1171
|
}
|
|
1158
1172
|
return _context17.abrupt("return", {
|
|
@@ -1161,7 +1175,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
1161
1175
|
message: (_backendError$message = backendError.message) !== null && _backendError$message !== void 0 ? _backendError$message : '后端拒绝 batch-metadata',
|
|
1162
1176
|
data: (_backendError$data = backendError.data) !== null && _backendError$data !== void 0 ? _backendError$data : null
|
|
1163
1177
|
});
|
|
1164
|
-
case
|
|
1178
|
+
case 35:
|
|
1165
1179
|
_message = _this.getUnknownErrorMessage(_context17.t1);
|
|
1166
1180
|
_this.logError("".concat(title, ": \u8BF7\u6C42\u5931\u8D25"), {
|
|
1167
1181
|
backendPath: backendPath,
|
|
@@ -1174,11 +1188,11 @@ var Server = /*#__PURE__*/function () {
|
|
|
1174
1188
|
message: _message,
|
|
1175
1189
|
data: null
|
|
1176
1190
|
});
|
|
1177
|
-
case
|
|
1191
|
+
case 38:
|
|
1178
1192
|
case "end":
|
|
1179
1193
|
return _context17.stop();
|
|
1180
1194
|
}
|
|
1181
|
-
}, _callee17, null, [[
|
|
1195
|
+
}, _callee17, null, [[10, 15], [23, 30]]);
|
|
1182
1196
|
}));
|
|
1183
1197
|
return function (_x17) {
|
|
1184
1198
|
return _ref43.apply(this, arguments);
|
|
@@ -2963,12 +2977,12 @@ var Server = /*#__PURE__*/function () {
|
|
|
2963
2977
|
handler: this.handleLocalPrintOrder.bind(this)
|
|
2964
2978
|
}, {
|
|
2965
2979
|
method: 'post',
|
|
2966
|
-
path: '/shop/machinecode/batch
|
|
2967
|
-
handler: this.
|
|
2980
|
+
path: '/shop/machinecode/batch',
|
|
2981
|
+
handler: this.handleMachinecodeBatchMeta.bind(this)
|
|
2968
2982
|
}, {
|
|
2969
2983
|
method: 'post',
|
|
2970
|
-
path: '/machinecode/batch
|
|
2971
|
-
handler: this.
|
|
2984
|
+
path: '/machinecode/batch',
|
|
2985
|
+
handler: this.handleMachinecodeBatchMeta.bind(this)
|
|
2972
2986
|
}]);
|
|
2973
2987
|
this.registerPrefixRoutes([{
|
|
2974
2988
|
method: 'get',
|
|
@@ -4502,11 +4516,11 @@ var Server = /*#__PURE__*/function () {
|
|
|
4502
4516
|
});
|
|
4503
4517
|
}
|
|
4504
4518
|
}, {
|
|
4505
|
-
key: "
|
|
4519
|
+
key: "syncMachinecodeRedeemStatusToLocalOrder",
|
|
4506
4520
|
value: function () {
|
|
4507
|
-
var
|
|
4521
|
+
var _syncMachinecodeRedeemStatusToLocalOrder = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee48(data, ids, status) {
|
|
4508
4522
|
var _this$order3;
|
|
4509
|
-
var title, lookup, localOrder,
|
|
4523
|
+
var title, lookup, localOrder, voucherIdSet, vouchers, hasUpdatedVoucher, nextVouchers;
|
|
4510
4524
|
return _regeneratorRuntime().wrap(function _callee48$(_context48) {
|
|
4511
4525
|
while (1) switch (_context48.prev = _context48.next) {
|
|
4512
4526
|
case 0:
|
|
@@ -4516,8 +4530,9 @@ var Server = /*#__PURE__*/function () {
|
|
|
4516
4530
|
_context48.next = 5;
|
|
4517
4531
|
break;
|
|
4518
4532
|
}
|
|
4519
|
-
this.logWarning("".concat(title, ": order lookup \u7F3A\u5931\uFF0C\u8DF3\u8FC7\u672C\u5730\u8BA2\u5355
|
|
4520
|
-
batchSize:
|
|
4533
|
+
this.logWarning("".concat(title, ": order lookup \u7F3A\u5931\uFF0C\u8DF3\u8FC7\u672C\u5730\u8BA2\u5355\u6838\u9500\u72B6\u6001\u66F4\u65B0"), {
|
|
4534
|
+
batchSize: ids.length,
|
|
4535
|
+
status: status
|
|
4521
4536
|
});
|
|
4522
4537
|
return _context48.abrupt("return");
|
|
4523
4538
|
case 5:
|
|
@@ -4525,8 +4540,9 @@ var Server = /*#__PURE__*/function () {
|
|
|
4525
4540
|
_context48.next = 8;
|
|
4526
4541
|
break;
|
|
4527
4542
|
}
|
|
4528
|
-
this.logWarning("".concat(title, ": Order \u6A21\u5757\u672A\u6CE8\u518C\uFF0C\u8DF3\u8FC7\u672C\u5730\u8BA2\u5355
|
|
4529
|
-
lookup: lookup
|
|
4543
|
+
this.logWarning("".concat(title, ": Order \u6A21\u5757\u672A\u6CE8\u518C\uFF0C\u8DF3\u8FC7\u672C\u5730\u8BA2\u5355\u6838\u9500\u72B6\u6001\u66F4\u65B0"), {
|
|
4544
|
+
lookup: lookup,
|
|
4545
|
+
status: status
|
|
4530
4546
|
});
|
|
4531
4547
|
return _context48.abrupt("return");
|
|
4532
4548
|
case 8:
|
|
@@ -4538,121 +4554,98 @@ var Server = /*#__PURE__*/function () {
|
|
|
4538
4554
|
_context48.next = 14;
|
|
4539
4555
|
break;
|
|
4540
4556
|
}
|
|
4541
|
-
this.logWarning("".concat(title, ": \u672C\u5730\u8BA2\u5355\u4E0D\u5B58\u5728\uFF0C\u8DF3\u8FC7
|
|
4542
|
-
lookup: lookup
|
|
4557
|
+
this.logWarning("".concat(title, ": \u672C\u5730\u8BA2\u5355\u4E0D\u5B58\u5728\uFF0C\u8DF3\u8FC7\u6838\u9500\u72B6\u6001\u66F4\u65B0"), {
|
|
4558
|
+
lookup: lookup,
|
|
4559
|
+
status: status
|
|
4543
4560
|
});
|
|
4544
4561
|
return _context48.abrupt("return");
|
|
4545
4562
|
case 14:
|
|
4546
|
-
|
|
4547
|
-
|
|
4548
|
-
|
|
4549
|
-
|
|
4550
|
-
|
|
4551
|
-
if ((
|
|
4552
|
-
_context48.next =
|
|
4553
|
-
break;
|
|
4554
|
-
}
|
|
4555
|
-
item = _step12.value;
|
|
4556
|
-
voucherId = (_item$voucher_id = item === null || item === void 0 ? void 0 : item.voucher_id) !== null && _item$voucher_id !== void 0 ? _item$voucher_id : item === null || item === void 0 ? void 0 : item.voucherId;
|
|
4557
|
-
if (!(voucherId === undefined || voucherId === null || voucherId === '')) {
|
|
4558
|
-
_context48.next = 23;
|
|
4559
|
-
break;
|
|
4560
|
-
}
|
|
4561
|
-
return _context48.abrupt("continue", 24);
|
|
4562
|
-
case 23:
|
|
4563
|
-
metadataByVoucherId.set(String(voucherId), (item === null || item === void 0 ? void 0 : item.metadata) || {});
|
|
4564
|
-
case 24:
|
|
4565
|
-
_context48.next = 18;
|
|
4566
|
-
break;
|
|
4567
|
-
case 26:
|
|
4568
|
-
_context48.next = 31;
|
|
4569
|
-
break;
|
|
4570
|
-
case 28:
|
|
4571
|
-
_context48.prev = 28;
|
|
4572
|
-
_context48.t0 = _context48["catch"](16);
|
|
4573
|
-
_iterator12.e(_context48.t0);
|
|
4574
|
-
case 31:
|
|
4575
|
-
_context48.prev = 31;
|
|
4576
|
-
_iterator12.f();
|
|
4577
|
-
return _context48.finish(31);
|
|
4578
|
-
case 34:
|
|
4579
|
-
if (!(metadataByVoucherId.size === 0)) {
|
|
4580
|
-
_context48.next = 37;
|
|
4563
|
+
voucherIdSet = new Set(ids.filter(function (id) {
|
|
4564
|
+
return id !== undefined && id !== null && id !== '';
|
|
4565
|
+
}).map(function (id) {
|
|
4566
|
+
return String(id);
|
|
4567
|
+
}));
|
|
4568
|
+
if (!(voucherIdSet.size === 0)) {
|
|
4569
|
+
_context48.next = 18;
|
|
4581
4570
|
break;
|
|
4582
4571
|
}
|
|
4583
|
-
this.logWarning("".concat(title, ": voucher
|
|
4584
|
-
lookup: lookup
|
|
4572
|
+
this.logWarning("".concat(title, ": voucher ids \u7F3A\u5931\uFF0C\u8DF3\u8FC7\u672C\u5730\u8BA2\u5355\u6838\u9500\u72B6\u6001\u66F4\u65B0"), {
|
|
4573
|
+
lookup: lookup,
|
|
4574
|
+
status: status
|
|
4585
4575
|
});
|
|
4586
4576
|
return _context48.abrupt("return");
|
|
4587
|
-
case
|
|
4577
|
+
case 18:
|
|
4588
4578
|
vouchers = Array.isArray(localOrder.vouchers) ? localOrder.vouchers : [];
|
|
4589
4579
|
hasUpdatedVoucher = false;
|
|
4590
4580
|
nextVouchers = vouchers.map(function (voucher) {
|
|
4591
4581
|
var voucherId = voucher === null || voucher === void 0 ? void 0 : voucher.voucher_id;
|
|
4592
4582
|
if (voucherId === undefined || voucherId === null) return voucher;
|
|
4593
|
-
|
|
4594
|
-
if (!metadata) return voucher;
|
|
4583
|
+
if (!voucherIdSet.has(String(voucherId))) return voucher;
|
|
4595
4584
|
hasUpdatedVoucher = true;
|
|
4596
4585
|
return _objectSpread(_objectSpread({}, voucher), {}, {
|
|
4597
|
-
|
|
4586
|
+
status: status
|
|
4598
4587
|
});
|
|
4599
4588
|
});
|
|
4600
4589
|
if (hasUpdatedVoucher) {
|
|
4601
|
-
_context48.next =
|
|
4590
|
+
_context48.next = 24;
|
|
4602
4591
|
break;
|
|
4603
4592
|
}
|
|
4604
|
-
this.logWarning("".concat(title, ": \u672C\u5730\u8BA2\u5355\u672A\u547D\u4E2D\u4EFB\u4F55 voucher\uFF0C\u8DF3\u8FC7
|
|
4593
|
+
this.logWarning("".concat(title, ": \u672C\u5730\u8BA2\u5355\u672A\u547D\u4E2D\u4EFB\u4F55 voucher\uFF0C\u8DF3\u8FC7\u6838\u9500\u72B6\u6001\u66F4\u65B0"), {
|
|
4605
4594
|
lookup: lookup,
|
|
4606
|
-
voucher_ids: Array.from(
|
|
4595
|
+
voucher_ids: Array.from(voucherIdSet),
|
|
4596
|
+
status: status
|
|
4607
4597
|
});
|
|
4608
4598
|
return _context48.abrupt("return");
|
|
4609
|
-
case
|
|
4599
|
+
case 24:
|
|
4610
4600
|
if (!(typeof this.order.overwriteExistingOrder === 'function')) {
|
|
4611
|
-
_context48.next =
|
|
4601
|
+
_context48.next = 29;
|
|
4612
4602
|
break;
|
|
4613
4603
|
}
|
|
4614
|
-
_context48.next =
|
|
4604
|
+
_context48.next = 27;
|
|
4615
4605
|
return this.order.overwriteExistingOrder(_objectSpread(_objectSpread({}, localOrder), {}, {
|
|
4616
4606
|
vouchers: nextVouchers
|
|
4617
4607
|
}));
|
|
4618
|
-
case
|
|
4619
|
-
this.logInfo("".concat(title, ": \u672C\u5730\u8BA2\u5355 vouchers
|
|
4608
|
+
case 27:
|
|
4609
|
+
this.logInfo("".concat(title, ": \u672C\u5730\u8BA2\u5355 vouchers \u6838\u9500\u72B6\u6001\u5DF2\u66F4\u65B0"), {
|
|
4620
4610
|
lookup: lookup,
|
|
4621
|
-
updatedCount:
|
|
4611
|
+
updatedCount: voucherIdSet.size,
|
|
4612
|
+
status: status
|
|
4622
4613
|
});
|
|
4623
4614
|
return _context48.abrupt("return");
|
|
4624
|
-
case
|
|
4615
|
+
case 29:
|
|
4625
4616
|
if (!(data !== null && data !== void 0 && data.external_sale_number && typeof this.order.markOrderSyncedByExternalSaleNumber === 'function')) {
|
|
4626
|
-
_context48.next =
|
|
4617
|
+
_context48.next = 34;
|
|
4627
4618
|
break;
|
|
4628
4619
|
}
|
|
4629
|
-
_context48.next =
|
|
4620
|
+
_context48.next = 32;
|
|
4630
4621
|
return this.order.markOrderSyncedByExternalSaleNumber({
|
|
4631
4622
|
externalSaleNumber: data.external_sale_number,
|
|
4632
4623
|
patch: {
|
|
4633
4624
|
vouchers: nextVouchers
|
|
4634
4625
|
}
|
|
4635
4626
|
});
|
|
4636
|
-
case
|
|
4637
|
-
this.logInfo("".concat(title, ": \u672C\u5730\u8BA2\u5355 vouchers
|
|
4627
|
+
case 32:
|
|
4628
|
+
this.logInfo("".concat(title, ": \u672C\u5730\u8BA2\u5355 vouchers \u6838\u9500\u72B6\u6001\u5DF2\u66F4\u65B0"), {
|
|
4638
4629
|
lookup: lookup,
|
|
4639
|
-
updatedCount:
|
|
4630
|
+
updatedCount: voucherIdSet.size,
|
|
4631
|
+
status: status
|
|
4640
4632
|
});
|
|
4641
4633
|
return _context48.abrupt("return");
|
|
4642
|
-
case
|
|
4643
|
-
this.logWarning("".concat(title, ": Order \u6A21\u5757\u4E0D\u652F\u6301\u672C\u5730\u8BA2\u5355\u8986\u76D6\uFF0C\u8DF3\u8FC7
|
|
4644
|
-
lookup: lookup
|
|
4634
|
+
case 34:
|
|
4635
|
+
this.logWarning("".concat(title, ": Order \u6A21\u5757\u4E0D\u652F\u6301\u672C\u5730\u8BA2\u5355\u8986\u76D6\uFF0C\u8DF3\u8FC7\u6838\u9500\u72B6\u6001\u66F4\u65B0"), {
|
|
4636
|
+
lookup: lookup,
|
|
4637
|
+
status: status
|
|
4645
4638
|
});
|
|
4646
|
-
case
|
|
4639
|
+
case 35:
|
|
4647
4640
|
case "end":
|
|
4648
4641
|
return _context48.stop();
|
|
4649
4642
|
}
|
|
4650
|
-
}, _callee48, this
|
|
4643
|
+
}, _callee48, this);
|
|
4651
4644
|
}));
|
|
4652
|
-
function
|
|
4653
|
-
return
|
|
4645
|
+
function syncMachinecodeRedeemStatusToLocalOrder(_x52, _x53, _x54) {
|
|
4646
|
+
return _syncMachinecodeRedeemStatusToLocalOrder.apply(this, arguments);
|
|
4654
4647
|
}
|
|
4655
|
-
return
|
|
4648
|
+
return syncMachinecodeRedeemStatusToLocalOrder;
|
|
4656
4649
|
}()
|
|
4657
4650
|
}, {
|
|
4658
4651
|
key: "handleOrderCheckoutSubmit",
|
|
@@ -4740,7 +4733,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
4740
4733
|
}
|
|
4741
4734
|
}, _callee49, this);
|
|
4742
4735
|
}));
|
|
4743
|
-
function handleOrderCheckoutSubmit(
|
|
4736
|
+
function handleOrderCheckoutSubmit(_x55) {
|
|
4744
4737
|
return _handleOrderCheckoutSubmit.apply(this, arguments);
|
|
4745
4738
|
}
|
|
4746
4739
|
return handleOrderCheckoutSubmit;
|
|
@@ -4822,7 +4815,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
4822
4815
|
}
|
|
4823
4816
|
}, _callee50, this, [[4, 14]]);
|
|
4824
4817
|
}));
|
|
4825
|
-
function handleSyncCheckoutSubmit(
|
|
4818
|
+
function handleSyncCheckoutSubmit(_x56) {
|
|
4826
4819
|
return _handleSyncCheckoutSubmit.apply(this, arguments);
|
|
4827
4820
|
}
|
|
4828
4821
|
return handleSyncCheckoutSubmit;
|
|
@@ -4921,7 +4914,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
4921
4914
|
}
|
|
4922
4915
|
}, _callee51, this, [[10, 18]]);
|
|
4923
4916
|
}));
|
|
4924
|
-
function handlePendingSyncCheckoutOrder(
|
|
4917
|
+
function handlePendingSyncCheckoutOrder(_x57) {
|
|
4925
4918
|
return _handlePendingSyncCheckoutOrder.apply(this, arguments);
|
|
4926
4919
|
}
|
|
4927
4920
|
return handlePendingSyncCheckoutOrder;
|
|
@@ -4965,7 +4958,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
4965
4958
|
}
|
|
4966
4959
|
}, _callee52, this);
|
|
4967
4960
|
}));
|
|
4968
|
-
function buildPendingSyncCheckoutOrder(
|
|
4961
|
+
function buildPendingSyncCheckoutOrder(_x58) {
|
|
4969
4962
|
return _buildPendingSyncCheckoutOrder.apply(this, arguments);
|
|
4970
4963
|
}
|
|
4971
4964
|
return buildPendingSyncCheckoutOrder;
|
|
@@ -5092,7 +5085,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
5092
5085
|
}
|
|
5093
5086
|
}, _callee53, null, [[0, 7]]);
|
|
5094
5087
|
}));
|
|
5095
|
-
return function (
|
|
5088
|
+
return function (_x60) {
|
|
5096
5089
|
return _ref60.apply(this, arguments);
|
|
5097
5090
|
};
|
|
5098
5091
|
}()));
|
|
@@ -5112,7 +5105,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
5112
5105
|
}
|
|
5113
5106
|
}, _callee54, this);
|
|
5114
5107
|
}));
|
|
5115
|
-
function buildSmallTicketProductMap(
|
|
5108
|
+
function buildSmallTicketProductMap(_x59) {
|
|
5116
5109
|
return _buildSmallTicketProductMap.apply(this, arguments);
|
|
5117
5110
|
}
|
|
5118
5111
|
return buildSmallTicketProductMap;
|
|
@@ -5245,7 +5238,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
5245
5238
|
value: function () {
|
|
5246
5239
|
var _enrichPaymentNamesByCode = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee55(order) {
|
|
5247
5240
|
var _this15 = this;
|
|
5248
|
-
var payments, hasMissingName, paymentModule, payMethods, nameByCode,
|
|
5241
|
+
var payments, hasMissingName, paymentModule, payMethods, nameByCode, _iterator12, _step12, method, codeKey, name, hasResolvedName, enrichedPayments;
|
|
5249
5242
|
return _regeneratorRuntime().wrap(function _callee55$(_context55) {
|
|
5250
5243
|
while (1) switch (_context55.prev = _context55.next) {
|
|
5251
5244
|
case 0:
|
|
@@ -5269,18 +5262,18 @@ var Server = /*#__PURE__*/function () {
|
|
|
5269
5262
|
case 10:
|
|
5270
5263
|
payMethods = _context55.sent;
|
|
5271
5264
|
nameByCode = new Map();
|
|
5272
|
-
|
|
5265
|
+
_iterator12 = _createForOfIteratorHelper(payMethods || []);
|
|
5273
5266
|
try {
|
|
5274
|
-
for (
|
|
5275
|
-
method =
|
|
5267
|
+
for (_iterator12.s(); !(_step12 = _iterator12.n()).done;) {
|
|
5268
|
+
method = _step12.value;
|
|
5276
5269
|
codeKey = this.getPaymentCodeKey(method === null || method === void 0 ? void 0 : method.code);
|
|
5277
5270
|
name = this.resolveFirstProductTitleValue(method === null || method === void 0 ? void 0 : method.name);
|
|
5278
5271
|
if (codeKey && name) nameByCode.set(codeKey, name);
|
|
5279
5272
|
}
|
|
5280
5273
|
} catch (err) {
|
|
5281
|
-
|
|
5274
|
+
_iterator12.e(err);
|
|
5282
5275
|
} finally {
|
|
5283
|
-
|
|
5276
|
+
_iterator12.f();
|
|
5284
5277
|
}
|
|
5285
5278
|
hasResolvedName = false;
|
|
5286
5279
|
enrichedPayments = payments.map(function (payment) {
|
|
@@ -5315,7 +5308,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
5315
5308
|
}
|
|
5316
5309
|
}, _callee55, this, [[4, 21]]);
|
|
5317
5310
|
}));
|
|
5318
|
-
function enrichPaymentNamesByCode(
|
|
5311
|
+
function enrichPaymentNamesByCode(_x61) {
|
|
5319
5312
|
return _enrichPaymentNamesByCode.apply(this, arguments);
|
|
5320
5313
|
}
|
|
5321
5314
|
return enrichPaymentNamesByCode;
|
|
@@ -5382,7 +5375,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
5382
5375
|
}
|
|
5383
5376
|
}, _callee56, this, [[4, 20]]);
|
|
5384
5377
|
}));
|
|
5385
|
-
function withLocalSmallTicketData(
|
|
5378
|
+
function withLocalSmallTicketData(_x62, _x63) {
|
|
5386
5379
|
return _withLocalSmallTicketData.apply(this, arguments);
|
|
5387
5380
|
}
|
|
5388
5381
|
return withLocalSmallTicketData;
|
|
@@ -5446,7 +5439,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
5446
5439
|
value: (function () {
|
|
5447
5440
|
var _handleUpdateLocalOrdersBatch = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee57(orderIds) {
|
|
5448
5441
|
var _this$app17;
|
|
5449
|
-
var existedBefore,
|
|
5442
|
+
var existedBefore, _iterator13, _step13, id, fetched, message, fetchedMap, _iterator14, _step14, order, oid, freshOrders, succeedIds, failed, _iterator15, _step15, _id, fresh, _message2, overwritten, inserted;
|
|
5450
5443
|
return _regeneratorRuntime().wrap(function _callee57$(_context57) {
|
|
5451
5444
|
while (1) switch (_context57.prev = _context57.next) {
|
|
5452
5445
|
case 0:
|
|
@@ -5480,18 +5473,18 @@ var Server = /*#__PURE__*/function () {
|
|
|
5480
5473
|
case 7:
|
|
5481
5474
|
// 拉取前先记录"本地是否已存在",用于区分 overwritten / inserted
|
|
5482
5475
|
existedBefore = new Map();
|
|
5483
|
-
|
|
5476
|
+
_iterator13 = _createForOfIteratorHelper(orderIds);
|
|
5484
5477
|
try {
|
|
5485
|
-
for (
|
|
5486
|
-
id =
|
|
5478
|
+
for (_iterator13.s(); !(_step13 = _iterator13.n()).done;) {
|
|
5479
|
+
id = _step13.value;
|
|
5487
5480
|
existedBefore.set(id, !!this.order.getOrderByOrderId(id));
|
|
5488
5481
|
}
|
|
5489
5482
|
|
|
5490
5483
|
// 走 orderDataSource 的批量 HTTP 通道,一次请求拉回多笔详情
|
|
5491
5484
|
} catch (err) {
|
|
5492
|
-
|
|
5485
|
+
_iterator13.e(err);
|
|
5493
5486
|
} finally {
|
|
5494
|
-
|
|
5487
|
+
_iterator13.f();
|
|
5495
5488
|
}
|
|
5496
5489
|
fetched = [];
|
|
5497
5490
|
_context57.prev = 11;
|
|
@@ -5517,15 +5510,15 @@ var Server = /*#__PURE__*/function () {
|
|
|
5517
5510
|
case 22:
|
|
5518
5511
|
// 按返回结果中的 order_id 建索引,未命中即视为单笔失败
|
|
5519
5512
|
fetchedMap = new Map();
|
|
5520
|
-
|
|
5513
|
+
_iterator14 = _createForOfIteratorHelper(fetched);
|
|
5521
5514
|
_context57.prev = 24;
|
|
5522
|
-
|
|
5515
|
+
_iterator14.s();
|
|
5523
5516
|
case 26:
|
|
5524
|
-
if ((
|
|
5517
|
+
if ((_step14 = _iterator14.n()).done) {
|
|
5525
5518
|
_context57.next = 34;
|
|
5526
5519
|
break;
|
|
5527
5520
|
}
|
|
5528
|
-
order =
|
|
5521
|
+
order = _step14.value;
|
|
5529
5522
|
oid = order === null || order === void 0 ? void 0 : order.order_id;
|
|
5530
5523
|
if (!(oid === undefined || oid === null)) {
|
|
5531
5524
|
_context57.next = 31;
|
|
@@ -5543,19 +5536,19 @@ var Server = /*#__PURE__*/function () {
|
|
|
5543
5536
|
case 36:
|
|
5544
5537
|
_context57.prev = 36;
|
|
5545
5538
|
_context57.t1 = _context57["catch"](24);
|
|
5546
|
-
|
|
5539
|
+
_iterator14.e(_context57.t1);
|
|
5547
5540
|
case 39:
|
|
5548
5541
|
_context57.prev = 39;
|
|
5549
|
-
|
|
5542
|
+
_iterator14.f();
|
|
5550
5543
|
return _context57.finish(39);
|
|
5551
5544
|
case 42:
|
|
5552
5545
|
freshOrders = [];
|
|
5553
5546
|
succeedIds = [];
|
|
5554
5547
|
failed = [];
|
|
5555
|
-
|
|
5548
|
+
_iterator15 = _createForOfIteratorHelper(orderIds);
|
|
5556
5549
|
try {
|
|
5557
|
-
for (
|
|
5558
|
-
_id =
|
|
5550
|
+
for (_iterator15.s(); !(_step15 = _iterator15.n()).done;) {
|
|
5551
|
+
_id = _step15.value;
|
|
5559
5552
|
fresh = fetchedMap.get(_id);
|
|
5560
5553
|
if (fresh) {
|
|
5561
5554
|
freshOrders.push(fresh);
|
|
@@ -5568,9 +5561,9 @@ var Server = /*#__PURE__*/function () {
|
|
|
5568
5561
|
}
|
|
5569
5562
|
}
|
|
5570
5563
|
} catch (err) {
|
|
5571
|
-
|
|
5564
|
+
_iterator15.e(err);
|
|
5572
5565
|
} finally {
|
|
5573
|
-
|
|
5566
|
+
_iterator15.f();
|
|
5574
5567
|
}
|
|
5575
5568
|
if (!(freshOrders.length > 0)) {
|
|
5576
5569
|
_context57.next = 58;
|
|
@@ -5624,7 +5617,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
5624
5617
|
}
|
|
5625
5618
|
}, _callee57, this, [[11, 17], [24, 36, 39, 42], [48, 53]]);
|
|
5626
5619
|
}));
|
|
5627
|
-
function handleUpdateLocalOrdersBatch(
|
|
5620
|
+
function handleUpdateLocalOrdersBatch(_x64) {
|
|
5628
5621
|
return _handleUpdateLocalOrdersBatch.apply(this, arguments);
|
|
5629
5622
|
}
|
|
5630
5623
|
return handleUpdateLocalOrdersBatch;
|
|
@@ -5645,11 +5638,11 @@ var Server = /*#__PURE__*/function () {
|
|
|
5645
5638
|
var queryIndex = url.indexOf('?');
|
|
5646
5639
|
if (queryIndex < 0) return null;
|
|
5647
5640
|
var query = url.slice(queryIndex + 1);
|
|
5648
|
-
var
|
|
5649
|
-
|
|
5641
|
+
var _iterator16 = _createForOfIteratorHelper(query.split('&')),
|
|
5642
|
+
_step16;
|
|
5650
5643
|
try {
|
|
5651
|
-
for (
|
|
5652
|
-
var pair =
|
|
5644
|
+
for (_iterator16.s(); !(_step16 = _iterator16.n()).done;) {
|
|
5645
|
+
var pair = _step16.value;
|
|
5653
5646
|
if (!pair) continue;
|
|
5654
5647
|
var _pair$split = pair.split('='),
|
|
5655
5648
|
_pair$split2 = _slicedToArray(_pair$split, 2),
|
|
@@ -5665,9 +5658,9 @@ var Server = /*#__PURE__*/function () {
|
|
|
5665
5658
|
}
|
|
5666
5659
|
}
|
|
5667
5660
|
} catch (err) {
|
|
5668
|
-
|
|
5661
|
+
_iterator16.e(err);
|
|
5669
5662
|
} finally {
|
|
5670
|
-
|
|
5663
|
+
_iterator16.f();
|
|
5671
5664
|
}
|
|
5672
5665
|
return null;
|
|
5673
5666
|
}
|
|
@@ -5989,7 +5982,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
5989
5982
|
key: "recomputeAndNotifyFloorPlanQuery",
|
|
5990
5983
|
value: (function () {
|
|
5991
5984
|
var _recomputeAndNotifyFloorPlanQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee58() {
|
|
5992
|
-
var
|
|
5985
|
+
var _iterator17, _step17, _step17$value, subscriberId, sub, result, errorMessage;
|
|
5993
5986
|
return _regeneratorRuntime().wrap(function _callee58$(_context58) {
|
|
5994
5987
|
while (1) switch (_context58.prev = _context58.next) {
|
|
5995
5988
|
case 0:
|
|
@@ -6002,10 +5995,10 @@ var Server = /*#__PURE__*/function () {
|
|
|
6002
5995
|
this.logInfo('recomputeAndNotifyFloorPlanQuery: 开始推送', {
|
|
6003
5996
|
subscriberCount: this.floorPlanQuerySubscribers.size
|
|
6004
5997
|
});
|
|
6005
|
-
|
|
5998
|
+
_iterator17 = _createForOfIteratorHelper(this.floorPlanQuerySubscribers.entries());
|
|
6006
5999
|
try {
|
|
6007
|
-
for (
|
|
6008
|
-
|
|
6000
|
+
for (_iterator17.s(); !(_step17 = _iterator17.n()).done;) {
|
|
6001
|
+
_step17$value = _slicedToArray(_step17.value, 2), subscriberId = _step17$value[0], sub = _step17$value[1];
|
|
6009
6002
|
try {
|
|
6010
6003
|
result = this.computeFloorPlanQueryResult(sub.context);
|
|
6011
6004
|
sub.callback(result);
|
|
@@ -6021,9 +6014,9 @@ var Server = /*#__PURE__*/function () {
|
|
|
6021
6014
|
}
|
|
6022
6015
|
}
|
|
6023
6016
|
} catch (err) {
|
|
6024
|
-
|
|
6017
|
+
_iterator17.e(err);
|
|
6025
6018
|
} finally {
|
|
6026
|
-
|
|
6019
|
+
_iterator17.f();
|
|
6027
6020
|
}
|
|
6028
6021
|
case 5:
|
|
6029
6022
|
case "end":
|
|
@@ -6109,7 +6102,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
6109
6102
|
}
|
|
6110
6103
|
}, _callee59, this);
|
|
6111
6104
|
}));
|
|
6112
|
-
function computeOrderQueryResult(
|
|
6105
|
+
function computeOrderQueryResult(_x65) {
|
|
6113
6106
|
return _computeOrderQueryResult.apply(this, arguments);
|
|
6114
6107
|
}
|
|
6115
6108
|
return computeOrderQueryResult;
|
|
@@ -6163,7 +6156,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
6163
6156
|
}
|
|
6164
6157
|
}, _callee60, this);
|
|
6165
6158
|
}));
|
|
6166
|
-
function computeBookingQueryResult(
|
|
6159
|
+
function computeBookingQueryResult(_x66) {
|
|
6167
6160
|
return _computeBookingQueryResult.apply(this, arguments);
|
|
6168
6161
|
}
|
|
6169
6162
|
return computeBookingQueryResult;
|
|
@@ -6532,7 +6525,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
6532
6525
|
}
|
|
6533
6526
|
}, _callee61, this);
|
|
6534
6527
|
}));
|
|
6535
|
-
function computeProductQueryResult(
|
|
6528
|
+
function computeProductQueryResult(_x67, _x68) {
|
|
6536
6529
|
return _computeProductQueryResult.apply(this, arguments);
|
|
6537
6530
|
}
|
|
6538
6531
|
return computeProductQueryResult;
|
|
@@ -6548,7 +6541,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
6548
6541
|
key: "recomputeAndNotifyProductQuery",
|
|
6549
6542
|
value: (function () {
|
|
6550
6543
|
var _recomputeAndNotifyProductQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee62(options) {
|
|
6551
|
-
var
|
|
6544
|
+
var _iterator18, _step18, _step18$value, subscriberId, subscriber, result, errorMessage;
|
|
6552
6545
|
return _regeneratorRuntime().wrap(function _callee62$(_context62) {
|
|
6553
6546
|
while (1) switch (_context62.prev = _context62.next) {
|
|
6554
6547
|
case 0:
|
|
@@ -6562,15 +6555,15 @@ var Server = /*#__PURE__*/function () {
|
|
|
6562
6555
|
subscriberCount: this.productQuerySubscribers.size,
|
|
6563
6556
|
changedIds: options === null || options === void 0 ? void 0 : options.changedIds
|
|
6564
6557
|
});
|
|
6565
|
-
|
|
6558
|
+
_iterator18 = _createForOfIteratorHelper(this.productQuerySubscribers.entries());
|
|
6566
6559
|
_context62.prev = 4;
|
|
6567
|
-
|
|
6560
|
+
_iterator18.s();
|
|
6568
6561
|
case 6:
|
|
6569
|
-
if ((
|
|
6562
|
+
if ((_step18 = _iterator18.n()).done) {
|
|
6570
6563
|
_context62.next = 22;
|
|
6571
6564
|
break;
|
|
6572
6565
|
}
|
|
6573
|
-
|
|
6566
|
+
_step18$value = _slicedToArray(_step18.value, 2), subscriberId = _step18$value[0], subscriber = _step18$value[1];
|
|
6574
6567
|
_context62.prev = 8;
|
|
6575
6568
|
_context62.next = 11;
|
|
6576
6569
|
return this.computeProductQueryResult(subscriber.context, {
|
|
@@ -6601,10 +6594,10 @@ var Server = /*#__PURE__*/function () {
|
|
|
6601
6594
|
case 24:
|
|
6602
6595
|
_context62.prev = 24;
|
|
6603
6596
|
_context62.t1 = _context62["catch"](4);
|
|
6604
|
-
|
|
6597
|
+
_iterator18.e(_context62.t1);
|
|
6605
6598
|
case 27:
|
|
6606
6599
|
_context62.prev = 27;
|
|
6607
|
-
|
|
6600
|
+
_iterator18.f();
|
|
6608
6601
|
return _context62.finish(27);
|
|
6609
6602
|
case 30:
|
|
6610
6603
|
case "end":
|
|
@@ -6612,7 +6605,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
6612
6605
|
}
|
|
6613
6606
|
}, _callee62, this, [[4, 24, 27, 30], [8, 16]]);
|
|
6614
6607
|
}));
|
|
6615
|
-
function recomputeAndNotifyProductQuery(
|
|
6608
|
+
function recomputeAndNotifyProductQuery(_x69) {
|
|
6616
6609
|
return _recomputeAndNotifyProductQuery.apply(this, arguments);
|
|
6617
6610
|
}
|
|
6618
6611
|
return recomputeAndNotifyProductQuery;
|
|
@@ -6625,7 +6618,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
6625
6618
|
key: "recomputeAndNotifyOrderQuery",
|
|
6626
6619
|
value: (function () {
|
|
6627
6620
|
var _recomputeAndNotifyOrderQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee63() {
|
|
6628
|
-
var notifyStartAt,
|
|
6621
|
+
var notifyStartAt, _iterator19, _step19, _step19$value, subscriberId, subscriber, computeStartAt, result, computeEndAt, callbackStartAt, callbackEndAt, errorMessage, notifyEndAt;
|
|
6629
6622
|
return _regeneratorRuntime().wrap(function _callee63$(_context63) {
|
|
6630
6623
|
while (1) switch (_context63.prev = _context63.next) {
|
|
6631
6624
|
case 0:
|
|
@@ -6640,15 +6633,15 @@ var Server = /*#__PURE__*/function () {
|
|
|
6640
6633
|
subscriberCount: this.orderQuerySubscribers.size,
|
|
6641
6634
|
notifyStartAt: new Date(notifyStartAt).toISOString()
|
|
6642
6635
|
});
|
|
6643
|
-
|
|
6636
|
+
_iterator19 = _createForOfIteratorHelper(this.orderQuerySubscribers.entries());
|
|
6644
6637
|
_context63.prev = 5;
|
|
6645
|
-
|
|
6638
|
+
_iterator19.s();
|
|
6646
6639
|
case 7:
|
|
6647
|
-
if ((
|
|
6640
|
+
if ((_step19 = _iterator19.n()).done) {
|
|
6648
6641
|
_context63.next = 27;
|
|
6649
6642
|
break;
|
|
6650
6643
|
}
|
|
6651
|
-
|
|
6644
|
+
_step19$value = _slicedToArray(_step19.value, 2), subscriberId = _step19$value[0], subscriber = _step19$value[1];
|
|
6652
6645
|
_context63.prev = 9;
|
|
6653
6646
|
computeStartAt = Date.now();
|
|
6654
6647
|
_context63.next = 13;
|
|
@@ -6684,10 +6677,10 @@ var Server = /*#__PURE__*/function () {
|
|
|
6684
6677
|
case 29:
|
|
6685
6678
|
_context63.prev = 29;
|
|
6686
6679
|
_context63.t1 = _context63["catch"](5);
|
|
6687
|
-
|
|
6680
|
+
_iterator19.e(_context63.t1);
|
|
6688
6681
|
case 32:
|
|
6689
6682
|
_context63.prev = 32;
|
|
6690
|
-
|
|
6683
|
+
_iterator19.f();
|
|
6691
6684
|
return _context63.finish(32);
|
|
6692
6685
|
case 35:
|
|
6693
6686
|
notifyEndAt = Date.now();
|
|
@@ -6726,13 +6719,13 @@ var Server = /*#__PURE__*/function () {
|
|
|
6726
6719
|
// 如果当前开启了 checkout 弹窗,先不进行刷新,下面的代码会导致在全局搜索页调用 bookingTicket.destroy()
|
|
6727
6720
|
// 导致模块被销毁 ,checkout 弹窗永远无法关闭
|
|
6728
6721
|
if (window.isPaymentModalPluginOpen) return;
|
|
6729
|
-
var
|
|
6730
|
-
|
|
6722
|
+
var _iterator20 = _createForOfIteratorHelper(this.salesSearchSubscribers.entries()),
|
|
6723
|
+
_step20;
|
|
6731
6724
|
try {
|
|
6732
6725
|
var _loop = function _loop() {
|
|
6733
|
-
var
|
|
6734
|
-
subscriberId =
|
|
6735
|
-
subscriber =
|
|
6726
|
+
var _step20$value = _slicedToArray(_step20.value, 2),
|
|
6727
|
+
subscriberId = _step20$value[0],
|
|
6728
|
+
subscriber = _step20$value[1];
|
|
6736
6729
|
try {
|
|
6737
6730
|
var changedVisibleOrders = changedOrders.filter(function (order) {
|
|
6738
6731
|
var orderId = _this18.getSalesSearchOrderId(order);
|
|
@@ -6755,13 +6748,13 @@ var Server = /*#__PURE__*/function () {
|
|
|
6755
6748
|
});
|
|
6756
6749
|
}
|
|
6757
6750
|
};
|
|
6758
|
-
for (
|
|
6751
|
+
for (_iterator20.s(); !(_step20 = _iterator20.n()).done;) {
|
|
6759
6752
|
if (_loop()) continue;
|
|
6760
6753
|
}
|
|
6761
6754
|
} catch (err) {
|
|
6762
|
-
|
|
6755
|
+
_iterator20.e(err);
|
|
6763
6756
|
} finally {
|
|
6764
|
-
|
|
6757
|
+
_iterator20.f();
|
|
6765
6758
|
}
|
|
6766
6759
|
}
|
|
6767
6760
|
|
|
@@ -6841,7 +6834,7 @@ var Server = /*#__PURE__*/function () {
|
|
|
6841
6834
|
key: "recomputeAndNotifyBookingQuery",
|
|
6842
6835
|
value: (function () {
|
|
6843
6836
|
var _recomputeAndNotifyBookingQuery = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee64() {
|
|
6844
|
-
var
|
|
6837
|
+
var _iterator21, _step21, _step21$value, subscriberId, subscriber, result, errorMessage;
|
|
6845
6838
|
return _regeneratorRuntime().wrap(function _callee64$(_context64) {
|
|
6846
6839
|
while (1) switch (_context64.prev = _context64.next) {
|
|
6847
6840
|
case 0:
|
|
@@ -6854,15 +6847,15 @@ var Server = /*#__PURE__*/function () {
|
|
|
6854
6847
|
this.logInfo('recomputeAndNotifyBookingQuery: 开始推送', {
|
|
6855
6848
|
subscriberCount: this.bookingQuerySubscribers.size
|
|
6856
6849
|
});
|
|
6857
|
-
|
|
6850
|
+
_iterator21 = _createForOfIteratorHelper(this.bookingQuerySubscribers.entries());
|
|
6858
6851
|
_context64.prev = 4;
|
|
6859
|
-
|
|
6852
|
+
_iterator21.s();
|
|
6860
6853
|
case 6:
|
|
6861
|
-
if ((
|
|
6854
|
+
if ((_step21 = _iterator21.n()).done) {
|
|
6862
6855
|
_context64.next = 22;
|
|
6863
6856
|
break;
|
|
6864
6857
|
}
|
|
6865
|
-
|
|
6858
|
+
_step21$value = _slicedToArray(_step21.value, 2), subscriberId = _step21$value[0], subscriber = _step21$value[1];
|
|
6866
6859
|
_context64.prev = 8;
|
|
6867
6860
|
_context64.next = 11;
|
|
6868
6861
|
return this.computeBookingQueryResult(subscriber.context);
|
|
@@ -6891,10 +6884,10 @@ var Server = /*#__PURE__*/function () {
|
|
|
6891
6884
|
case 24:
|
|
6892
6885
|
_context64.prev = 24;
|
|
6893
6886
|
_context64.t1 = _context64["catch"](4);
|
|
6894
|
-
|
|
6887
|
+
_iterator21.e(_context64.t1);
|
|
6895
6888
|
case 27:
|
|
6896
6889
|
_context64.prev = 27;
|
|
6897
|
-
|
|
6890
|
+
_iterator21.f();
|
|
6898
6891
|
return _context64.finish(27);
|
|
6899
6892
|
case 30:
|
|
6900
6893
|
case "end":
|
|
@@ -6930,11 +6923,11 @@ var Server = /*#__PURE__*/function () {
|
|
|
6930
6923
|
var allowedProductIds = new Set();
|
|
6931
6924
|
var allowedCollectionIds = new Set();
|
|
6932
6925
|
var hasProductAll = false;
|
|
6933
|
-
var
|
|
6934
|
-
|
|
6926
|
+
var _iterator22 = _createForOfIteratorHelper(activeMenuList),
|
|
6927
|
+
_step22;
|
|
6935
6928
|
try {
|
|
6936
|
-
for (
|
|
6937
|
-
var menu =
|
|
6929
|
+
for (_iterator22.s(); !(_step22 = _iterator22.n()).done;) {
|
|
6930
|
+
var menu = _step22.value;
|
|
6938
6931
|
var config = menu.partyroom_package;
|
|
6939
6932
|
if (!config) {
|
|
6940
6933
|
console.warn('[Server] 餐牌缺少 partyroom_package 配置:', menu);
|
|
@@ -6994,9 +6987,9 @@ var Server = /*#__PURE__*/function () {
|
|
|
6994
6987
|
|
|
6995
6988
|
// 如果有餐牌允许所有商品,返回所有商品
|
|
6996
6989
|
} catch (err) {
|
|
6997
|
-
|
|
6990
|
+
_iterator22.e(err);
|
|
6998
6991
|
} finally {
|
|
6999
|
-
|
|
6992
|
+
_iterator22.f();
|
|
7000
6993
|
}
|
|
7001
6994
|
if (hasProductAll) {
|
|
7002
6995
|
this.logInfo('getProductScopeByMenuConfig: 返回所有商品 scope(product_all)');
|
|
@@ -555,7 +555,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
|
|
|
555
555
|
handlePrintWristband(params: {
|
|
556
556
|
voucher_ids: number[];
|
|
557
557
|
}): Promise<void>;
|
|
558
|
-
|
|
558
|
+
handleRedeem(params: {
|
|
559
559
|
voucher_ids: number[];
|
|
560
560
|
is_checkin: boolean;
|
|
561
561
|
}): Promise<any>;
|
|
@@ -2657,45 +2657,35 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
|
|
|
2657
2657
|
return _handlePrintWristband.apply(this, arguments);
|
|
2658
2658
|
}
|
|
2659
2659
|
return handlePrintWristband;
|
|
2660
|
-
}() //
|
|
2660
|
+
}() // 触发核销
|
|
2661
2661
|
}, {
|
|
2662
|
-
key: "
|
|
2662
|
+
key: "handleRedeem",
|
|
2663
2663
|
value: function () {
|
|
2664
|
-
var
|
|
2664
|
+
var _handleRedeem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee33(params) {
|
|
2665
2665
|
var _this$store$order5, _this$store$order5$ge, _this$store$order6, _ref20, _tempOrder$order_id2;
|
|
2666
|
-
var voucherIds, voucherIdSet, tempOrder, vouchers,
|
|
2666
|
+
var voucherIds, status, voucherIdSet, tempOrder, vouchers, hasUpdatedVoucher, nextVouchers, identity, externalSaleNumber, orderId, orderLookup;
|
|
2667
2667
|
return _regeneratorRuntime().wrap(function _callee33$(_context33) {
|
|
2668
2668
|
while (1) switch (_context33.prev = _context33.next) {
|
|
2669
2669
|
case 0:
|
|
2670
|
+
voucherIds = Array.isArray(params.voucher_ids) ? params.voucher_ids : [];
|
|
2671
|
+
status = params.is_checkin ? 'used' : 'unused';
|
|
2670
2672
|
this.logger.addLog({
|
|
2671
2673
|
type: 'info',
|
|
2672
|
-
title: '[BookingTicket]
|
|
2674
|
+
title: '[BookingTicket] handleRedeem',
|
|
2673
2675
|
metadata: {
|
|
2674
|
-
voucher_ids:
|
|
2675
|
-
|
|
2676
|
+
voucher_ids: voucherIds,
|
|
2677
|
+
status: status
|
|
2676
2678
|
}
|
|
2677
2679
|
});
|
|
2678
|
-
voucherIds = Array.isArray(params.voucher_ids) ? params.voucher_ids : [];
|
|
2679
2680
|
voucherIdSet = new Set(voucherIds);
|
|
2680
2681
|
tempOrder = (_this$store$order5 = this.store.order) === null || _this$store$order5 === void 0 || (_this$store$order5$ge = _this$store$order5.getTempOrder) === null || _this$store$order5$ge === void 0 ? void 0 : _this$store$order5$ge.call(_this$store$order5);
|
|
2681
2682
|
vouchers = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.vouchers) || ((_this$store$order6 = this.store.order) === null || _this$store$order6 === void 0 ? void 0 : _this$store$order6.getVouchers()) || [];
|
|
2682
|
-
batchMetadata = [];
|
|
2683
2683
|
hasUpdatedVoucher = false;
|
|
2684
2684
|
nextVouchers = vouchers.map(function (voucher) {
|
|
2685
|
-
var _voucher$metadata;
|
|
2686
2685
|
if (!voucherIdSet.has(voucher.voucher_id)) return voucher;
|
|
2687
2686
|
hasUpdatedVoucher = true;
|
|
2688
|
-
var metadata = _objectSpread(_objectSpread({}, voucher.metadata || {}), {}, {
|
|
2689
|
-
ticket: _objectSpread(_objectSpread({}, ((_voucher$metadata = voucher.metadata) === null || _voucher$metadata === void 0 ? void 0 : _voucher$metadata.ticket) || {}), {}, {
|
|
2690
|
-
is_checkin: params.is_checkin
|
|
2691
|
-
})
|
|
2692
|
-
});
|
|
2693
|
-
batchMetadata.push({
|
|
2694
|
-
voucher_id: voucher.voucher_id,
|
|
2695
|
-
metadata: metadata
|
|
2696
|
-
});
|
|
2697
2687
|
return _objectSpread(_objectSpread({}, voucher), {}, {
|
|
2698
|
-
|
|
2688
|
+
status: status
|
|
2699
2689
|
});
|
|
2700
2690
|
});
|
|
2701
2691
|
if (!(tempOrder && hasUpdatedVoucher)) {
|
|
@@ -2708,7 +2698,7 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
|
|
|
2708
2698
|
}));
|
|
2709
2699
|
case 11:
|
|
2710
2700
|
this.core.effects.emit("".concat(this.name, ":onVouchersChange"), {});
|
|
2711
|
-
if (!(
|
|
2701
|
+
if (!(voucherIds.length === 0)) {
|
|
2712
2702
|
_context33.next = 14;
|
|
2713
2703
|
break;
|
|
2714
2704
|
}
|
|
@@ -2723,8 +2713,9 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
|
|
|
2723
2713
|
externalSaleNumber = (tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.external_sale_number) || (identity === null || identity === void 0 ? void 0 : identity.externalSaleNumber) || undefined;
|
|
2724
2714
|
orderId = (_ref20 = (_tempOrder$order_id2 = tempOrder === null || tempOrder === void 0 ? void 0 : tempOrder.order_id) !== null && _tempOrder$order_id2 !== void 0 ? _tempOrder$order_id2 : identity === null || identity === void 0 ? void 0 : identity.orderId) !== null && _ref20 !== void 0 ? _ref20 : undefined;
|
|
2725
2715
|
orderLookup = externalSaleNumber || orderId || (identity === null || identity === void 0 ? void 0 : identity.orderNumber) || (identity === null || identity === void 0 ? void 0 : identity.shopOrderNumber) || (identity === null || identity === void 0 ? void 0 : identity.shopFullOrderNumber) || undefined;
|
|
2726
|
-
return _context33.abrupt("return", this.request.post('/machinecode/batch
|
|
2727
|
-
|
|
2716
|
+
return _context33.abrupt("return", this.request.post('/machinecode/batch', {
|
|
2717
|
+
ids: voucherIds,
|
|
2718
|
+
status: status,
|
|
2728
2719
|
order_lookup: orderLookup,
|
|
2729
2720
|
order_id: orderId,
|
|
2730
2721
|
external_sale_number: externalSaleNumber
|
|
@@ -2737,10 +2728,10 @@ export var BookingTicketImpl = /*#__PURE__*/function (_BaseSalesImpl) {
|
|
|
2737
2728
|
}
|
|
2738
2729
|
}, _callee33, this);
|
|
2739
2730
|
}));
|
|
2740
|
-
function
|
|
2741
|
-
return
|
|
2731
|
+
function handleRedeem(_x24) {
|
|
2732
|
+
return _handleRedeem.apply(this, arguments);
|
|
2742
2733
|
}
|
|
2743
|
-
return
|
|
2734
|
+
return handleRedeem;
|
|
2744
2735
|
}()
|
|
2745
2736
|
/**
|
|
2746
2737
|
* 销毁模块:先调用父类(销毁所有 store 内子模块 + emit destroy + super.destroy()),
|
package/lib/server/index.d.ts
CHANGED
|
@@ -431,9 +431,9 @@ declare class Server {
|
|
|
431
431
|
private shouldLookupLocalPrintOrder;
|
|
432
432
|
private getLocalPrintOrderLookup;
|
|
433
433
|
private handleLocalPrintOrder;
|
|
434
|
-
private
|
|
434
|
+
private handleMachinecodeBatchMeta;
|
|
435
435
|
private resolveMachinecodeBatchMetadataLookup;
|
|
436
|
-
private
|
|
436
|
+
private syncMachinecodeRedeemStatusToLocalOrder;
|
|
437
437
|
private handleOrderCheckoutSubmit;
|
|
438
438
|
private handleSyncCheckoutSubmit;
|
|
439
439
|
private handlePendingSyncCheckoutOrder;
|
package/lib/server/index.js
CHANGED
|
@@ -662,17 +662,19 @@ var Server = class {
|
|
|
662
662
|
};
|
|
663
663
|
}
|
|
664
664
|
};
|
|
665
|
-
this.
|
|
665
|
+
this.handleMachinecodeBatchMeta = async ({ data }) => {
|
|
666
666
|
var _a, _b;
|
|
667
|
-
const title = "
|
|
668
|
-
const backendPath = "/shop/machinecode/batch
|
|
669
|
-
const
|
|
667
|
+
const title = "handleMachinecodeBatchMeta";
|
|
668
|
+
const backendPath = "/shop/machinecode/batch";
|
|
669
|
+
const ids = Array.isArray(data == null ? void 0 : data.ids) ? data.ids : [];
|
|
670
|
+
const status = data == null ? void 0 : data.status;
|
|
670
671
|
this.logInfo(`${title}: 开始处理`, {
|
|
671
672
|
backendPath,
|
|
672
|
-
batchSize:
|
|
673
|
+
batchSize: ids.length,
|
|
674
|
+
status,
|
|
673
675
|
order_lookup: this.resolveMachinecodeBatchMetadataLookup(data) ?? null
|
|
674
676
|
});
|
|
675
|
-
if (
|
|
677
|
+
if (ids.length === 0) {
|
|
676
678
|
return {
|
|
677
679
|
code: 200,
|
|
678
680
|
status: true,
|
|
@@ -680,11 +682,19 @@ var Server = class {
|
|
|
680
682
|
data: []
|
|
681
683
|
};
|
|
682
684
|
}
|
|
685
|
+
if (status !== "used" && status !== "unused") {
|
|
686
|
+
return {
|
|
687
|
+
code: 400,
|
|
688
|
+
status: false,
|
|
689
|
+
message: "无效的核销状态",
|
|
690
|
+
data: null
|
|
691
|
+
};
|
|
692
|
+
}
|
|
683
693
|
try {
|
|
684
|
-
await this.
|
|
694
|
+
await this.syncMachinecodeRedeemStatusToLocalOrder(data, ids, status);
|
|
685
695
|
} catch (error) {
|
|
686
696
|
const message = this.getUnknownErrorMessage(error);
|
|
687
|
-
this.logError(`${title}:
|
|
697
|
+
this.logError(`${title}: 本地订单核销状态更新失败`, {
|
|
688
698
|
error: message,
|
|
689
699
|
error_detail: this.normalizeUnknownError(error)
|
|
690
700
|
});
|
|
@@ -706,7 +716,8 @@ var Server = class {
|
|
|
706
716
|
}
|
|
707
717
|
try {
|
|
708
718
|
const response = await this.app.request.post(backendPath, {
|
|
709
|
-
|
|
719
|
+
ids,
|
|
720
|
+
status
|
|
710
721
|
}, {
|
|
711
722
|
isShopApi: true,
|
|
712
723
|
customToast: () => {
|
|
@@ -1827,13 +1838,13 @@ var Server = class {
|
|
|
1827
1838
|
},
|
|
1828
1839
|
{
|
|
1829
1840
|
method: "post",
|
|
1830
|
-
path: "/shop/machinecode/batch
|
|
1831
|
-
handler: this.
|
|
1841
|
+
path: "/shop/machinecode/batch",
|
|
1842
|
+
handler: this.handleMachinecodeBatchMeta.bind(this)
|
|
1832
1843
|
},
|
|
1833
1844
|
{
|
|
1834
1845
|
method: "post",
|
|
1835
|
-
path: "/machinecode/batch
|
|
1836
|
-
handler: this.
|
|
1846
|
+
path: "/machinecode/batch",
|
|
1847
|
+
handler: this.handleMachinecodeBatchMeta.bind(this)
|
|
1837
1848
|
}
|
|
1838
1849
|
]);
|
|
1839
1850
|
this.registerPrefixRoutes([
|
|
@@ -2839,39 +2850,39 @@ var Server = class {
|
|
|
2839
2850
|
];
|
|
2840
2851
|
return candidates.find((candidate) => candidate !== void 0 && candidate !== null && candidate !== "");
|
|
2841
2852
|
}
|
|
2842
|
-
async
|
|
2853
|
+
async syncMachinecodeRedeemStatusToLocalOrder(data, ids, status) {
|
|
2843
2854
|
var _a;
|
|
2844
2855
|
const title = "handleMachinecodeBatchMetadata";
|
|
2845
2856
|
const lookup = this.resolveMachinecodeBatchMetadataLookup(data);
|
|
2846
2857
|
if (lookup === void 0) {
|
|
2847
|
-
this.logWarning(`${title}: order lookup
|
|
2848
|
-
batchSize:
|
|
2858
|
+
this.logWarning(`${title}: order lookup 缺失,跳过本地订单核销状态更新`, {
|
|
2859
|
+
batchSize: ids.length,
|
|
2860
|
+
status
|
|
2849
2861
|
});
|
|
2850
2862
|
return;
|
|
2851
2863
|
}
|
|
2852
2864
|
if (!((_a = this.order) == null ? void 0 : _a.getLocalOrderByLookup)) {
|
|
2853
|
-
this.logWarning(`${title}: Order
|
|
2854
|
-
lookup
|
|
2865
|
+
this.logWarning(`${title}: Order 模块未注册,跳过本地订单核销状态更新`, {
|
|
2866
|
+
lookup,
|
|
2867
|
+
status
|
|
2855
2868
|
});
|
|
2856
2869
|
return;
|
|
2857
2870
|
}
|
|
2858
2871
|
const localOrder = await this.order.getLocalOrderByLookup(lookup);
|
|
2859
2872
|
if (!localOrder) {
|
|
2860
|
-
this.logWarning(`${title}:
|
|
2861
|
-
lookup
|
|
2873
|
+
this.logWarning(`${title}: 本地订单不存在,跳过核销状态更新`, {
|
|
2874
|
+
lookup,
|
|
2875
|
+
status
|
|
2862
2876
|
});
|
|
2863
2877
|
return;
|
|
2864
2878
|
}
|
|
2865
|
-
const
|
|
2866
|
-
|
|
2867
|
-
|
|
2868
|
-
|
|
2869
|
-
|
|
2870
|
-
|
|
2871
|
-
|
|
2872
|
-
if (metadataByVoucherId.size === 0) {
|
|
2873
|
-
this.logWarning(`${title}: voucher metadata 缺失,跳过本地订单 metadata 更新`, {
|
|
2874
|
-
lookup
|
|
2879
|
+
const voucherIdSet = new Set(
|
|
2880
|
+
ids.filter((id) => id !== void 0 && id !== null && id !== "").map((id) => String(id))
|
|
2881
|
+
);
|
|
2882
|
+
if (voucherIdSet.size === 0) {
|
|
2883
|
+
this.logWarning(`${title}: voucher ids 缺失,跳过本地订单核销状态更新`, {
|
|
2884
|
+
lookup,
|
|
2885
|
+
status
|
|
2875
2886
|
});
|
|
2876
2887
|
return;
|
|
2877
2888
|
}
|
|
@@ -2881,19 +2892,19 @@ var Server = class {
|
|
|
2881
2892
|
const voucherId = voucher == null ? void 0 : voucher.voucher_id;
|
|
2882
2893
|
if (voucherId === void 0 || voucherId === null)
|
|
2883
2894
|
return voucher;
|
|
2884
|
-
|
|
2885
|
-
if (!metadata)
|
|
2895
|
+
if (!voucherIdSet.has(String(voucherId)))
|
|
2886
2896
|
return voucher;
|
|
2887
2897
|
hasUpdatedVoucher = true;
|
|
2888
2898
|
return {
|
|
2889
2899
|
...voucher,
|
|
2890
|
-
|
|
2900
|
+
status
|
|
2891
2901
|
};
|
|
2892
2902
|
});
|
|
2893
2903
|
if (!hasUpdatedVoucher) {
|
|
2894
|
-
this.logWarning(`${title}: 本地订单未命中任何 voucher
|
|
2904
|
+
this.logWarning(`${title}: 本地订单未命中任何 voucher,跳过核销状态更新`, {
|
|
2895
2905
|
lookup,
|
|
2896
|
-
voucher_ids: Array.from(
|
|
2906
|
+
voucher_ids: Array.from(voucherIdSet),
|
|
2907
|
+
status
|
|
2897
2908
|
});
|
|
2898
2909
|
return;
|
|
2899
2910
|
}
|
|
@@ -2902,9 +2913,10 @@ var Server = class {
|
|
|
2902
2913
|
...localOrder,
|
|
2903
2914
|
vouchers: nextVouchers
|
|
2904
2915
|
});
|
|
2905
|
-
this.logInfo(`${title}: 本地订单 vouchers
|
|
2916
|
+
this.logInfo(`${title}: 本地订单 vouchers 核销状态已更新`, {
|
|
2906
2917
|
lookup,
|
|
2907
|
-
updatedCount:
|
|
2918
|
+
updatedCount: voucherIdSet.size,
|
|
2919
|
+
status
|
|
2908
2920
|
});
|
|
2909
2921
|
return;
|
|
2910
2922
|
}
|
|
@@ -2913,14 +2925,16 @@ var Server = class {
|
|
|
2913
2925
|
externalSaleNumber: data.external_sale_number,
|
|
2914
2926
|
patch: { vouchers: nextVouchers }
|
|
2915
2927
|
});
|
|
2916
|
-
this.logInfo(`${title}: 本地订单 vouchers
|
|
2928
|
+
this.logInfo(`${title}: 本地订单 vouchers 核销状态已更新`, {
|
|
2917
2929
|
lookup,
|
|
2918
|
-
updatedCount:
|
|
2930
|
+
updatedCount: voucherIdSet.size,
|
|
2931
|
+
status
|
|
2919
2932
|
});
|
|
2920
2933
|
return;
|
|
2921
2934
|
}
|
|
2922
|
-
this.logWarning(`${title}: Order
|
|
2923
|
-
lookup
|
|
2935
|
+
this.logWarning(`${title}: Order 模块不支持本地订单覆盖,跳过核销状态更新`, {
|
|
2936
|
+
lookup,
|
|
2937
|
+
status
|
|
2924
2938
|
});
|
|
2925
2939
|
}
|
|
2926
2940
|
async handleOrderCheckoutSubmit(params) {
|
|
@@ -555,7 +555,7 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
|
|
|
555
555
|
handlePrintWristband(params: {
|
|
556
556
|
voucher_ids: number[];
|
|
557
557
|
}): Promise<void>;
|
|
558
|
-
|
|
558
|
+
handleRedeem(params: {
|
|
559
559
|
voucher_ids: number[];
|
|
560
560
|
is_checkin: boolean;
|
|
561
561
|
}): Promise<any>;
|
|
@@ -1551,42 +1551,30 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
|
|
|
1551
1551
|
source_id: idempotencyKey
|
|
1552
1552
|
});
|
|
1553
1553
|
}
|
|
1554
|
-
//
|
|
1555
|
-
async
|
|
1554
|
+
// 触发核销
|
|
1555
|
+
async handleRedeem(params) {
|
|
1556
1556
|
var _a, _b, _c;
|
|
1557
|
+
const voucherIds = Array.isArray(params.voucher_ids) ? params.voucher_ids : [];
|
|
1558
|
+
const status = params.is_checkin ? "used" : "unused";
|
|
1557
1559
|
this.logger.addLog({
|
|
1558
1560
|
type: "info",
|
|
1559
|
-
title: "[BookingTicket]
|
|
1561
|
+
title: "[BookingTicket] handleRedeem",
|
|
1560
1562
|
metadata: {
|
|
1561
|
-
voucher_ids:
|
|
1562
|
-
|
|
1563
|
+
voucher_ids: voucherIds,
|
|
1564
|
+
status
|
|
1563
1565
|
}
|
|
1564
1566
|
});
|
|
1565
|
-
const voucherIds = Array.isArray(params.voucher_ids) ? params.voucher_ids : [];
|
|
1566
1567
|
const voucherIdSet = new Set(voucherIds);
|
|
1567
1568
|
const tempOrder = (_b = (_a = this.store.order) == null ? void 0 : _a.getTempOrder) == null ? void 0 : _b.call(_a);
|
|
1568
1569
|
const vouchers = (tempOrder == null ? void 0 : tempOrder.vouchers) || ((_c = this.store.order) == null ? void 0 : _c.getVouchers()) || [];
|
|
1569
|
-
const batchMetadata = [];
|
|
1570
1570
|
let hasUpdatedVoucher = false;
|
|
1571
1571
|
const nextVouchers = vouchers.map((voucher) => {
|
|
1572
|
-
var _a2;
|
|
1573
1572
|
if (!voucherIdSet.has(voucher.voucher_id))
|
|
1574
1573
|
return voucher;
|
|
1575
1574
|
hasUpdatedVoucher = true;
|
|
1576
|
-
const metadata = {
|
|
1577
|
-
...voucher.metadata || {},
|
|
1578
|
-
ticket: {
|
|
1579
|
-
...((_a2 = voucher.metadata) == null ? void 0 : _a2.ticket) || {},
|
|
1580
|
-
is_checkin: params.is_checkin
|
|
1581
|
-
}
|
|
1582
|
-
};
|
|
1583
|
-
batchMetadata.push({
|
|
1584
|
-
voucher_id: voucher.voucher_id,
|
|
1585
|
-
metadata
|
|
1586
|
-
});
|
|
1587
1575
|
return {
|
|
1588
1576
|
...voucher,
|
|
1589
|
-
|
|
1577
|
+
status
|
|
1590
1578
|
};
|
|
1591
1579
|
});
|
|
1592
1580
|
if (tempOrder && hasUpdatedVoucher) {
|
|
@@ -1596,7 +1584,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
|
|
|
1596
1584
|
});
|
|
1597
1585
|
}
|
|
1598
1586
|
this.core.effects.emit(`${this.name}:onVouchersChange`, {});
|
|
1599
|
-
if (
|
|
1587
|
+
if (voucherIds.length === 0) {
|
|
1600
1588
|
return {
|
|
1601
1589
|
code: 200,
|
|
1602
1590
|
status: true,
|
|
@@ -1608,8 +1596,9 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
|
|
|
1608
1596
|
const externalSaleNumber = (tempOrder == null ? void 0 : tempOrder.external_sale_number) || (identity == null ? void 0 : identity.externalSaleNumber) || void 0;
|
|
1609
1597
|
const orderId = (tempOrder == null ? void 0 : tempOrder.order_id) ?? (identity == null ? void 0 : identity.orderId) ?? void 0;
|
|
1610
1598
|
const orderLookup = externalSaleNumber || orderId || (identity == null ? void 0 : identity.orderNumber) || (identity == null ? void 0 : identity.shopOrderNumber) || (identity == null ? void 0 : identity.shopFullOrderNumber) || void 0;
|
|
1611
|
-
return this.request.post("/machinecode/batch
|
|
1612
|
-
|
|
1599
|
+
return this.request.post("/machinecode/batch", {
|
|
1600
|
+
ids: voucherIds,
|
|
1601
|
+
status,
|
|
1613
1602
|
order_lookup: orderLookup,
|
|
1614
1603
|
order_id: orderId,
|
|
1615
1604
|
external_sale_number: externalSaleNumber
|