@pisell/pisellos 2.2.221 → 2.2.223

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.
Files changed (48) hide show
  1. package/dist/model/strategy/adapter/promotion/index.js +9 -0
  2. package/dist/modules/Customer/index.d.ts +7 -0
  3. package/dist/modules/Customer/index.js +27 -0
  4. package/dist/modules/OpenData/index.js +1 -1
  5. package/dist/modules/Order/index.js +17 -11
  6. package/dist/modules/Order/types.d.ts +3 -0
  7. package/dist/modules/Order/utils.js +6 -5
  8. package/dist/modules/Payment/types.d.ts +2 -0
  9. package/dist/modules/SalesSummary/index.js +3 -3
  10. package/dist/modules/Schedule/index.js +3 -1
  11. package/dist/modules/Summary/index.js +4 -3
  12. package/dist/server/index.d.ts +2 -0
  13. package/dist/server/index.js +48 -18
  14. package/dist/server/modules/order/index.js +3 -2
  15. package/dist/server/modules/order/types.d.ts +1 -1
  16. package/dist/server/modules/order/utils/filterBookings.js +1 -1
  17. package/dist/server/modules/schedule/index.d.ts +4 -4
  18. package/dist/server/modules/schedule/index.js +99 -83
  19. package/dist/server/utils/small-ticket.d.ts +3 -1
  20. package/dist/server/utils/small-ticket.js +106 -18
  21. package/dist/solution/BaseSales/index.js +7 -2
  22. package/dist/solution/BookingByStep/index.d.ts +1 -1
  23. package/dist/solution/BookingTicket/index.d.ts +3 -1
  24. package/dist/solution/BookingTicket/index.js +12 -8
  25. package/lib/modules/Customer/index.d.ts +7 -0
  26. package/lib/modules/Customer/index.js +26 -0
  27. package/lib/modules/OpenData/index.js +1 -1
  28. package/lib/modules/Order/index.js +7 -3
  29. package/lib/modules/Order/types.d.ts +3 -0
  30. package/lib/modules/Order/utils.js +2 -1
  31. package/lib/modules/Payment/types.d.ts +2 -0
  32. package/lib/modules/SalesSummary/index.js +2 -1
  33. package/lib/modules/Schedule/index.js +3 -1
  34. package/lib/modules/Summary/index.js +5 -4
  35. package/lib/server/index.d.ts +2 -0
  36. package/lib/server/index.js +37 -7
  37. package/lib/server/modules/order/index.js +1 -0
  38. package/lib/server/modules/order/types.d.ts +1 -1
  39. package/lib/server/modules/order/utils/filterBookings.js +7 -3
  40. package/lib/server/modules/schedule/index.d.ts +4 -4
  41. package/lib/server/modules/schedule/index.js +45 -39
  42. package/lib/server/utils/small-ticket.d.ts +3 -1
  43. package/lib/server/utils/small-ticket.js +85 -11
  44. package/lib/solution/BaseSales/index.js +6 -2
  45. package/lib/solution/BookingByStep/index.d.ts +1 -1
  46. package/lib/solution/BookingTicket/index.d.ts +3 -1
  47. package/lib/solution/BookingTicket/index.js +3 -3
  48. package/package.json +1 -1
package/lib/solution/BaseSales/index.js CHANGED
@@ -109,7 +109,7 @@ function mergeBaseSalesUniqueArray(currentValue, loadedValue, metadataKey) {
109
109
  function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord) {
110
110
  if (!currentTempOrder)
111
111
  return loadedRecord;
112
- return (0, import_lodash_es.mergeWith)(
112
+ const mergedRecord = (0, import_lodash_es.mergeWith)(
113
113
  (0, import_lodash_es.cloneDeep)(currentTempOrder),
114
114
  (0, import_lodash_es.cloneDeep)(loadedRecord || {}),
115
115
  (currentValue, loadedValue, key) => {
@@ -131,6 +131,8 @@ function mergeSalesDetailRecordWithTempOrder(currentTempOrder, loadedRecord) {
131
131
  return void 0;
132
132
  }
133
133
  );
134
+ delete mergedRecord.request_unique_idempotency_token;
135
+ return mergedRecord;
134
136
  }
135
137
  var BaseSalesImpl = class extends import_BaseModule.BaseModule {
136
138
  constructor(name, version) {
@@ -1389,9 +1391,11 @@ var BaseSalesImpl = class extends import_BaseModule.BaseModule {
1389
1391
  if (!metadata.unique_payment_number) {
1390
1392
  metadata.unique_payment_number = (0, import_utils.createUuidV4)();
1391
1393
  }
1394
+ const paymentTime = paymentRecord.payment_time ?? (0, import_dayjs.default)().format("YYYY-MM-DD HH:mm:ss");
1392
1395
  const payments = this.store.order.addOrderPayment({
1393
1396
  ...paymentRecord,
1394
- metadata
1397
+ metadata,
1398
+ payment_time: paymentTime
1395
1399
  });
1396
1400
  const amountSnapshot = this.store.order.getOrderAmountSnapshot();
1397
1401
  const syncState = this.store.order.getOrderSyncState();
package/lib/solution/BookingByStep/index.d.ts CHANGED
@@ -311,7 +311,7 @@ export declare class BookingByStepImpl extends BaseModule implements Module {
311
311
  date: string;
312
312
  status: string;
313
313
  week: string;
314
- weekNum: 0 | 2 | 1 | 3 | 4 | 5 | 6;
314
+ weekNum: 0 | 1 | 2 | 3 | 5 | 4 | 6;
315
315
  }[]>;
316
316
  submitTimeSlot(timeSlots: TimeSliceItem): void;
317
317
  private getScheduleDataByIds;
package/lib/solution/BookingTicket/index.d.ts CHANGED
@@ -109,7 +109,9 @@ export declare class BookingTicketImpl extends BaseSalesImpl implements Module {
109
109
  *
110
110
  * @returns loadSalesDetail 的返回值
111
111
  */
112
- refreshSalesDetail(): Promise<ISalesDetail>;
112
+ refreshSalesDetail(params?: {
113
+ forceRemote?: boolean;
114
+ }): Promise<ISalesDetail>;
113
115
  /**
114
116
  * 获取商品列表
115
117
  * @param params 包含 schedule_date 的参数
package/lib/solution/BookingTicket/index.js CHANGED
@@ -465,7 +465,7 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
465
465
  *
466
466
  * @returns loadSalesDetail 的返回值
467
467
  */
468
- async refreshSalesDetail() {
468
+ async refreshSalesDetail(params = {}) {
469
469
  var _a, _b;
470
470
  const tempOrder = (_b = (_a = this.store.order) == null ? void 0 : _a.getTempOrder) == null ? void 0 : _b.call(_a);
471
471
  if (!tempOrder) {
@@ -477,8 +477,8 @@ var BookingTicketImpl = class extends import_BaseSales.BaseSalesImpl {
477
477
  }
478
478
  return this.loadSalesDetail({
479
479
  orderId: Number(orderId),
480
- merge: true
481
- // forceRemote: true,
480
+ // merge: true
481
+ forceRemote: params.forceRemote
482
482
  });
483
483
  }
484
484
  /**
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": false,
3
3
  "name": "@pisell/pisellos",
4
- "version": "2.2.221",
4
+ "version": "2.2.223",
5
5
  "description": "一个可扩展的前端模块化SDK框架，支持插件系统",
6
6
  "main": "dist/index.js",
7
7
  "types": "dist/index.d.ts",