ts-glitter 21.8.3 → 21.8.6
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/lowcode/Entry.js +1 -1
- package/lowcode/Entry.ts +1 -1
- package/lowcode/backend-manager/bg-dialog.js +342 -100
- package/lowcode/backend-manager/bg-dialog.ts +432 -145
- package/lowcode/backend-manager/bg-widget.js +4 -4
- package/lowcode/backend-manager/bg-widget.ts +5 -5
- package/lowcode/cms-plugin/POS-setting.js +18 -6
- package/lowcode/cms-plugin/POS-setting.ts +22 -10
- package/lowcode/cms-plugin/pos-pages/payment-page.js +9 -2
- package/lowcode/cms-plugin/pos-pages/payment-page.ts +11 -3
- package/lowcode/cms-plugin/shopping-discount-setting.js +148 -92
- package/lowcode/cms-plugin/shopping-discount-setting.ts +162 -111
- package/lowcode/cms-plugin/shopping-product-stock.js +58 -45
- package/lowcode/cms-plugin/shopping-product-stock.ts +66 -49
- package/lowcode/cms-plugin/stock-stores.js +55 -0
- package/lowcode/cms-plugin/stock-stores.ts +59 -0
- package/lowcode/css/editor.css +8 -9
- package/lowcode/editor/basic-component.js +0 -10
- package/lowcode/editor/basic-component.ts +1 -11
- package/lowcode/glitter-base/route/article.js +50 -51
- package/lowcode/glitter-base/route/article.ts +102 -103
- package/lowcode/glitter-base/route/recommend.js +1 -0
- package/lowcode/glitter-base/route/recommend.ts +141 -123
- package/lowcode/glitterBundle/plugins/html-render.js +2 -0
- package/lowcode/glitterBundle/plugins/html-render.ts +1 -0
- package/lowcode/jspage/function-page/setting_editor.js +1 -1
- package/lowcode/jspage/function-page/setting_editor.ts +1 -1
- package/lowcode/jspage/function-page/tool-setting.js +0 -1
- package/lowcode/jspage/function-page/tool-setting.ts +0 -1
- package/lowcode/jspage/main.js +6 -1
- package/lowcode/jspage/main.ts +6 -1
- package/lowcode/modules/image-library-clone.ts +2 -0
- package/lowcode/modules/image-library.js +118 -155
- package/lowcode/modules/image-library.ts +134 -197
- package/lowcode/official_view_component/official/component.js +1 -1
- package/lowcode/official_view_component/official/component.ts +1 -1
- package/lowcode/public-components/banner/first-banner.js +85 -50
- package/lowcode/public-components/banner/first-banner.ts +96 -59
- package/lowcode/public-components/layout-plugin/social-links-01.js +19 -19
- package/lowcode/public-components/layout-plugin/social-links-01.ts +35 -35
- package/package.json +1 -1
- package/src/api-public/controllers/article.js +11 -0
- package/src/api-public/controllers/article.js.map +1 -1
- package/src/api-public/controllers/article.ts +13 -0
- package/src/api-public/controllers/recommend.js +1 -0
- package/src/api-public/controllers/recommend.js.map +1 -1
- package/src/api-public/controllers/recommend.ts +99 -89
- package/src/api-public/services/checkout-event.js +81 -43
- package/src/api-public/services/checkout-event.js.map +1 -1
- package/src/api-public/services/checkout-event.ts +93 -38
- package/src/api-public/services/post.js +7 -17
- package/src/api-public/services/post.js.map +1 -1
- package/src/api-public/services/recommend.d.ts +1 -0
- package/src/api-public/services/recommend.js +12 -2
- package/src/api-public/services/recommend.js.map +1 -1
- package/src/api-public/services/recommend.ts +375 -354
- package/src/api-public/services/shopping.d.ts +1 -0
- package/src/api-public/services/shopping.js +4 -2
- package/src/api-public/services/shopping.js.map +1 -1
- package/src/api-public/services/shopping.ts +7 -2
- package/src/services/saas-table-check.js +1 -1
- package/src/services/saas-table-check.js.map +1 -1
- package/src/services/saas-table-check.ts +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recommend.js","sourceRoot":"","sources":["recommend.ts"],"names":[],"mappings":";;;;AAAA,sDAA8B;AAC9B,sEAA8C;AAC9C,wEAAgD;AAChD,gEAAyD;AACzD,qDAAkD;AAElD,MAAM,MAAM,GAAmB,iBAAO,CAAC,MAAM,EAAE,CAAC;AAIhD,MAAM,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,GAAoB,EAAE,IAAsB,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"recommend.js","sourceRoot":"","sources":["recommend.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,126 +9,136 @@ const router: express.Router = express.Router();
|
|
|
9
9
|
export = router;
|
|
10
10
|
|
|
11
11
|
router.get('/list', async (req: express.Request, resp: express.Response) => {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
} catch (err) {
|
|
27
|
-
return response.fail(resp, err);
|
|
12
|
+
try {
|
|
13
|
+
if (await UtPermission.isManager(req)) {
|
|
14
|
+
return response.succ(
|
|
15
|
+
resp,
|
|
16
|
+
await new Recommend(req.get('g-app') as string, req.body.token).getLinkList({
|
|
17
|
+
user_id: req.query.user_id ? `${req.query.user_id}` : undefined,
|
|
18
|
+
page: req.query.page ? parseInt(`${req.query.page}`, 10) : 0,
|
|
19
|
+
limit: req.query.limit ? parseInt(`${req.query.limit}`, 10) : 0,
|
|
20
|
+
code: req.query.code ? `${req.query.code}` : '',
|
|
21
|
+
id_list: req.query.id_list ? `${req.query.id_list}` : '',
|
|
22
|
+
})
|
|
23
|
+
);
|
|
24
|
+
} else {
|
|
25
|
+
return response.fail(resp, exception.BadRequestError('BAD_REQUEST', 'No permission.', null));
|
|
28
26
|
}
|
|
27
|
+
} catch (err) {
|
|
28
|
+
return response.fail(resp, err);
|
|
29
|
+
}
|
|
29
30
|
});
|
|
30
31
|
|
|
31
32
|
router.post('/list', async (req: express.Request, resp: express.Response) => {
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
}
|
|
38
|
-
} catch (err) {
|
|
39
|
-
return response.fail(resp, err);
|
|
33
|
+
try {
|
|
34
|
+
if (await UtPermission.isManager(req)) {
|
|
35
|
+
return response.succ(resp, await new Recommend(req.get('g-app') as string, req.body.token).postLink(req.body));
|
|
36
|
+
} else {
|
|
37
|
+
return response.fail(resp, exception.BadRequestError('BAD_REQUEST', 'No permission.', null));
|
|
40
38
|
}
|
|
39
|
+
} catch (err) {
|
|
40
|
+
return response.fail(resp, err);
|
|
41
|
+
}
|
|
41
42
|
});
|
|
42
43
|
|
|
43
44
|
router.put('/list/:id', async (req: express.Request, resp: express.Response) => {
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
}
|
|
51
|
-
|
|
45
|
+
try {
|
|
46
|
+
if (await UtPermission.isManager(req)) {
|
|
47
|
+
return response.succ(
|
|
48
|
+
resp,
|
|
49
|
+
await new Recommend(req.get('g-app') as string, req.body.token).putLink(req.params.id, req.body)
|
|
50
|
+
);
|
|
51
|
+
} else {
|
|
52
|
+
return response.fail(resp, exception.BadRequestError('BAD_REQUEST', 'No permission.', null));
|
|
52
53
|
}
|
|
54
|
+
} catch (err) {
|
|
55
|
+
return response.fail(resp, err);
|
|
56
|
+
}
|
|
53
57
|
});
|
|
54
58
|
|
|
55
59
|
router.post('/list/toggle/:id', async (req: express.Request, resp: express.Response) => {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
}
|
|
63
|
-
|
|
60
|
+
try {
|
|
61
|
+
if (await UtPermission.isManager(req)) {
|
|
62
|
+
return response.succ(
|
|
63
|
+
resp,
|
|
64
|
+
await new Recommend(req.get('g-app') as string, req.body.token).toggleLink(req.params.id)
|
|
65
|
+
);
|
|
66
|
+
} else {
|
|
67
|
+
return response.fail(resp, exception.BadRequestError('BAD_REQUEST', 'No permission.', null));
|
|
64
68
|
}
|
|
69
|
+
} catch (err) {
|
|
70
|
+
return response.fail(resp, err);
|
|
71
|
+
}
|
|
65
72
|
});
|
|
66
73
|
|
|
67
74
|
router.delete('/list', async (req: express.Request, resp: express.Response) => {
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
}
|
|
74
|
-
} catch (err) {
|
|
75
|
-
return response.fail(resp, err);
|
|
75
|
+
try {
|
|
76
|
+
if (await UtPermission.isManager(req)) {
|
|
77
|
+
return response.succ(resp, await new Recommend(req.get('g-app') as string, req.body.token).deleteLink(req.body));
|
|
78
|
+
} else {
|
|
79
|
+
return response.fail(resp, exception.BadRequestError('BAD_REQUEST', 'No permission.', null));
|
|
76
80
|
}
|
|
81
|
+
} catch (err) {
|
|
82
|
+
return response.fail(resp, err);
|
|
83
|
+
}
|
|
77
84
|
});
|
|
78
85
|
|
|
79
86
|
router.get('/user', async (req: express.Request, resp: express.Response) => {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
}
|
|
95
|
-
} catch (err) {
|
|
96
|
-
return response.fail(resp, err);
|
|
87
|
+
try {
|
|
88
|
+
if (await UtPermission.isManager(req)) {
|
|
89
|
+
return response.succ(
|
|
90
|
+
resp,
|
|
91
|
+
await new Recommend(req.get('g-app') as string, req.body.token).getUserList({
|
|
92
|
+
limit: req.query.limit ? parseInt(`${req.query.limit}`, 10) : 0,
|
|
93
|
+
page: req.query.page ? parseInt(`${req.query.page}`, 10) : 50,
|
|
94
|
+
search: req.query.search ? `${req.query.search}` : undefined,
|
|
95
|
+
searchType: req.query.searchType ? `${req.query.searchType}` : undefined,
|
|
96
|
+
orderBy: req.query.orderBy ? `${req.query.orderBy}` : undefined,
|
|
97
|
+
})
|
|
98
|
+
);
|
|
99
|
+
} else {
|
|
100
|
+
return response.fail(resp, exception.BadRequestError('BAD_REQUEST', 'No permission.', null));
|
|
97
101
|
}
|
|
102
|
+
} catch (err) {
|
|
103
|
+
return response.fail(resp, err);
|
|
104
|
+
}
|
|
98
105
|
});
|
|
99
106
|
|
|
100
107
|
router.post('/user', async (req: express.Request, resp: express.Response) => {
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
}
|
|
107
|
-
} catch (err) {
|
|
108
|
-
return response.fail(resp, err);
|
|
108
|
+
try {
|
|
109
|
+
if (await UtPermission.isManager(req)) {
|
|
110
|
+
return response.succ(resp, await new Recommend(req.get('g-app') as string, req.body.token).postUser(req.body));
|
|
111
|
+
} else {
|
|
112
|
+
return response.fail(resp, exception.BadRequestError('BAD_REQUEST', 'No permission.', null));
|
|
109
113
|
}
|
|
114
|
+
} catch (err) {
|
|
115
|
+
return response.fail(resp, err);
|
|
116
|
+
}
|
|
110
117
|
});
|
|
111
118
|
|
|
112
119
|
router.put('/user/:id', async (req: express.Request, resp: express.Response) => {
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
}
|
|
120
|
-
|
|
120
|
+
try {
|
|
121
|
+
if (await UtPermission.isManager(req)) {
|
|
122
|
+
return response.succ(
|
|
123
|
+
resp,
|
|
124
|
+
await new Recommend(req.get('g-app') as string, req.body.token).putUser(req.params.id, req.body)
|
|
125
|
+
);
|
|
126
|
+
} else {
|
|
127
|
+
return response.fail(resp, exception.BadRequestError('BAD_REQUEST', 'No permission.', null));
|
|
121
128
|
}
|
|
129
|
+
} catch (err) {
|
|
130
|
+
return response.fail(resp, err);
|
|
131
|
+
}
|
|
122
132
|
});
|
|
123
133
|
|
|
124
134
|
router.delete('/user', async (req: express.Request, resp: express.Response) => {
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
}
|
|
131
|
-
} catch (err) {
|
|
132
|
-
return response.fail(resp, err);
|
|
135
|
+
try {
|
|
136
|
+
if (await UtPermission.isManager(req)) {
|
|
137
|
+
return response.succ(resp, await new Recommend(req.get('g-app') as string, req.body.token).deleteUser(req.body));
|
|
138
|
+
} else {
|
|
139
|
+
return response.fail(resp, exception.BadRequestError('BAD_REQUEST', 'No permission.', null));
|
|
133
140
|
}
|
|
141
|
+
} catch (err) {
|
|
142
|
+
return response.fail(resp, err);
|
|
143
|
+
}
|
|
134
144
|
});
|
|
@@ -58,7 +58,7 @@ class CheckoutEvent {
|
|
|
58
58
|
return JSON.parse(JSON.stringify((0, glitter_finance_js_1.onlinePayArray)()));
|
|
59
59
|
}
|
|
60
60
|
async toCheckout(data, type = 'add', replace_order_id) {
|
|
61
|
-
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16;
|
|
61
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17;
|
|
62
62
|
try {
|
|
63
63
|
const utTimer = new ut_timer_js_1.UtTimer('TO-CHECKOUT');
|
|
64
64
|
const checkPoint = utTimer.checkPoint;
|
|
@@ -155,7 +155,7 @@ class CheckoutEvent {
|
|
|
155
155
|
const userData = await getUserDataAsync(type, this.token, data);
|
|
156
156
|
if (data.customer_info) {
|
|
157
157
|
const newCustomerInfo = (_f = (await userClass.getUserData(data.email || data.customer_info.email, 'email_or_phone'))) !== null && _f !== void 0 ? _f : {
|
|
158
|
-
userData: {}
|
|
158
|
+
userData: {},
|
|
159
159
|
};
|
|
160
160
|
data.customer_info = Object.assign(Object.assign({}, data.customer_info), newCustomerInfo.userData);
|
|
161
161
|
}
|
|
@@ -313,8 +313,9 @@ class CheckoutEvent {
|
|
|
313
313
|
}
|
|
314
314
|
}
|
|
315
315
|
const store_info = await userClass.getConfigV2({ key: 'store-information', user_id: 'manager' });
|
|
316
|
+
const store_manager = (_z = (await userClass.getConfigV2({ key: 'store_manager', user_id: 'manager' })).list) !== null && _z !== void 0 ? _z : [];
|
|
316
317
|
data.line_items = await Promise.all(data.line_items.map(async (item) => {
|
|
317
|
-
var _a, _b, _c
|
|
318
|
+
var _a, _b, _c;
|
|
318
319
|
const getProductData = (await this.shopping.getProduct({
|
|
319
320
|
page: 0,
|
|
320
321
|
limit: 1,
|
|
@@ -336,7 +337,20 @@ class CheckoutEvent {
|
|
|
336
337
|
const isUnderstockingVisible = variant.show_understocking !== 'false';
|
|
337
338
|
const isManualType = type === 'manual' || type === 'manual-preview';
|
|
338
339
|
if (isPOS && isUnderstockingVisible && !data.isExhibition) {
|
|
339
|
-
variant.stock =
|
|
340
|
+
variant.stock =
|
|
341
|
+
store_manager
|
|
342
|
+
.filter((dd) => {
|
|
343
|
+
var _a;
|
|
344
|
+
return (dd.id === data.pos_store ||
|
|
345
|
+
((_a = store_manager.find((dd) => {
|
|
346
|
+
return dd.id === data.pos_store;
|
|
347
|
+
}).support_store) !== null && _a !== void 0 ? _a : []).includes(dd.id));
|
|
348
|
+
})
|
|
349
|
+
.map((d1) => {
|
|
350
|
+
var _a, _b;
|
|
351
|
+
return (_b = (_a = variant.stockList) === null || _a === void 0 ? void 0 : _a[d1.id]) === null || _b === void 0 ? void 0 : _b.count;
|
|
352
|
+
})
|
|
353
|
+
.reduce((acc, val) => acc + val, 0) || 0;
|
|
340
354
|
}
|
|
341
355
|
if (variant.stock < item.count && isUnderstockingVisible && !isManualType) {
|
|
342
356
|
if (isPOS || isPreOrderStore) {
|
|
@@ -378,7 +392,7 @@ class CheckoutEvent {
|
|
|
378
392
|
show_understocking: variant.show_understocking,
|
|
379
393
|
stockList: variant.stockList,
|
|
380
394
|
weight: parseInt(variant.weight || '0', 10),
|
|
381
|
-
designated_logistics: (
|
|
395
|
+
designated_logistics: (_a = content.designated_logistics) !== null && _a !== void 0 ? _a : { type: 'all', list: [] },
|
|
382
396
|
product_customize_tag: content.product_customize_tag || [],
|
|
383
397
|
});
|
|
384
398
|
const shipmentValue = (() => {
|
|
@@ -403,8 +417,8 @@ class CheckoutEvent {
|
|
|
403
417
|
if (!scheduledData) {
|
|
404
418
|
const sql = `WHERE JSON_CONTAINS(content->'$.pending_order', '"${data.temp_cart_id}"'`;
|
|
405
419
|
const scheduledDataQuery = `
|
|
406
|
-
|
|
407
|
-
|
|
420
|
+
SELECT *
|
|
421
|
+
FROM \`${this.app}\`.\`t_live_purchase_interactions\` ${sql});
|
|
408
422
|
`;
|
|
409
423
|
scheduledData = (await database_js_1.default.query(scheduledDataQuery, []))[0];
|
|
410
424
|
if (scheduledData) {
|
|
@@ -439,15 +453,37 @@ class CheckoutEvent {
|
|
|
439
453
|
}
|
|
440
454
|
}
|
|
441
455
|
else {
|
|
442
|
-
|
|
443
|
-
|
|
456
|
+
const refer = JSON.parse(JSON.stringify(variant.stockList));
|
|
457
|
+
console.log(`refer.stockList===>`, variant.stockList);
|
|
458
|
+
Object.keys(refer).forEach(key => {
|
|
459
|
+
var _a;
|
|
460
|
+
if ((key !== data.pos_store) &&
|
|
461
|
+
(!((_a = store_manager.find((dd) => {
|
|
462
|
+
return dd.id === data.pos_store;
|
|
463
|
+
}).support_store) !== null && _a !== void 0 ? _a : []).includes(key))) {
|
|
464
|
+
delete refer[key];
|
|
465
|
+
}
|
|
466
|
+
});
|
|
467
|
+
console.log(`refer===>`, refer);
|
|
468
|
+
const returnData = new stock_js_1.Stock(this.app, this.token).allocateStock(refer, item.count);
|
|
469
|
+
variant.stockList = Object.assign(Object.assign({}, variant.stockList), refer);
|
|
470
|
+
variant.deduction_log = Object.assign(Object.assign({}, variant.deduction_log), returnData.deductionLog);
|
|
444
471
|
item.deduction_log = variant.deduction_log;
|
|
472
|
+
console.log(`item.deduction_log===>`, item.deduction_log);
|
|
473
|
+
console.log(`variant.stockList===>`, variant.stockList);
|
|
474
|
+
console.log(`variant.deduction_log===>`, variant.deduction_log);
|
|
475
|
+
content.variants.forEach((d1, index) => {
|
|
476
|
+
console.log(`update-content-pos->`, d1.stockList);
|
|
477
|
+
});
|
|
445
478
|
}
|
|
446
479
|
}
|
|
447
480
|
else {
|
|
448
481
|
const returnData = new stock_js_1.Stock(this.app, this.token).allocateStock(variant.stockList, item.count);
|
|
449
482
|
variant.deduction_log = returnData.deductionLog;
|
|
450
483
|
item.deduction_log = returnData.deductionLog;
|
|
484
|
+
content.variants.forEach((d1, index) => {
|
|
485
|
+
console.log(`update-content-web->`, d1.stockList);
|
|
486
|
+
});
|
|
451
487
|
}
|
|
452
488
|
saveStockArray.push(() => new Promise(async (resolve, reject) => {
|
|
453
489
|
var _a;
|
|
@@ -456,8 +492,8 @@ class CheckoutEvent {
|
|
|
456
492
|
if (!scheduledData) {
|
|
457
493
|
const sql = `WHERE JSON_CONTAINS(content->'$.pending_order', '"${data.temp_cart_id}"'`;
|
|
458
494
|
const scheduledDataQuery = `
|
|
459
|
-
|
|
460
|
-
|
|
495
|
+
SELECT *
|
|
496
|
+
FROM \`${this.app}\`.\`t_live_purchase_interactions\` ${sql});
|
|
461
497
|
`;
|
|
462
498
|
scheduledData = (await database_js_1.default.query(scheduledDataQuery, []))[0];
|
|
463
499
|
}
|
|
@@ -492,11 +528,12 @@ class CheckoutEvent {
|
|
|
492
528
|
item.deduction_log = { [store_config.list[0].id]: item.count };
|
|
493
529
|
}
|
|
494
530
|
else {
|
|
495
|
-
|
|
531
|
+
content.variants.forEach((d1, index) => {
|
|
532
|
+
console.log(`update-content->`, d1.stockList);
|
|
533
|
+
});
|
|
534
|
+
await this.shopping.postVariantsAndPriceValue(content);
|
|
496
535
|
}
|
|
497
|
-
|
|
498
|
-
SET ?
|
|
499
|
-
WHERE id = ${getProductData.id}`, [{ content: JSON.stringify(content) }]);
|
|
536
|
+
console.log(`post-variants===>`, content);
|
|
500
537
|
}
|
|
501
538
|
resolve(true);
|
|
502
539
|
}
|
|
@@ -511,8 +548,8 @@ class CheckoutEvent {
|
|
|
511
548
|
is_hidden: content.visible === 'false',
|
|
512
549
|
is_gift: content.productType.giveaway,
|
|
513
550
|
sale_price: content.productType.giveaway ? 0 : item.sale_price,
|
|
514
|
-
min_qty: (
|
|
515
|
-
max_qty: (
|
|
551
|
+
min_qty: (_b = content.min_qty) !== null && _b !== void 0 ? _b : item.min_qty,
|
|
552
|
+
max_qty: (_c = content.max_qty) !== null && _c !== void 0 ? _c : item.max_qty,
|
|
516
553
|
});
|
|
517
554
|
item.is_add_on_items && add_on_items.push(item);
|
|
518
555
|
item.is_gift && gift_product.push(item);
|
|
@@ -530,24 +567,24 @@ class CheckoutEvent {
|
|
|
530
567
|
}
|
|
531
568
|
if (hasMaxProduct && data.email !== 'no-email') {
|
|
532
569
|
const cartTokenSQL = `
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
570
|
+
SELECT cart_token
|
|
571
|
+
FROM \`${this.app}\`.t_checkout
|
|
572
|
+
WHERE email IN (${[-99, (_0 = userData === null || userData === void 0 ? void 0 : userData.userData) === null || _0 === void 0 ? void 0 : _0.email, (_1 = userData === null || userData === void 0 ? void 0 : userData.userData) === null || _1 === void 0 ? void 0 : _1.phone]
|
|
536
573
|
.filter(Boolean)
|
|
537
574
|
.map(item => database_js_1.default.escape(item))
|
|
538
575
|
.join(',')})
|
|
539
|
-
|
|
576
|
+
AND order_status <> '-1'
|
|
540
577
|
`;
|
|
541
578
|
const soldHistory = await database_js_1.default.query(`
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
579
|
+
SELECT *
|
|
580
|
+
FROM \`${this.app}\`.t_products_sold_history
|
|
581
|
+
WHERE product_id IN (${[...maxProductMap.keys()].join(',')})
|
|
582
|
+
AND order_id IN (${cartTokenSQL})
|
|
546
583
|
`, []);
|
|
547
584
|
const purchaseHistory = new Map();
|
|
548
585
|
for (const history of soldHistory) {
|
|
549
586
|
const pid = Number(history.product_id);
|
|
550
|
-
purchaseHistory.set(pid, ((
|
|
587
|
+
purchaseHistory.set(pid, ((_2 = purchaseHistory.get(pid)) !== null && _2 !== void 0 ? _2 : 0) + history.count);
|
|
551
588
|
}
|
|
552
589
|
for (const item of data.line_items) {
|
|
553
590
|
if (maxProductMap.has(item.id)) {
|
|
@@ -556,13 +593,13 @@ class CheckoutEvent {
|
|
|
556
593
|
}
|
|
557
594
|
}
|
|
558
595
|
checkPoint('set max product');
|
|
559
|
-
carData.select_shipment_setting = ((
|
|
596
|
+
carData.select_shipment_setting = ((_3 = data === null || data === void 0 ? void 0 : data.user_info) === null || _3 === void 0 ? void 0 : _3.shipment)
|
|
560
597
|
? await userClass.getConfigV2({
|
|
561
598
|
key: 'shipment_config_' + data.user_info.shipment,
|
|
562
599
|
user_id: 'manager',
|
|
563
600
|
})
|
|
564
601
|
: {};
|
|
565
|
-
const freeShipmnetNum = (
|
|
602
|
+
const freeShipmnetNum = (_6 = (_5 = (_4 = carData.select_shipment_setting) === null || _4 === void 0 ? void 0 : _4.cartSetting) === null || _5 === void 0 ? void 0 : _5.freeShipmnetTarget) !== null && _6 !== void 0 ? _6 : 0;
|
|
566
603
|
const isFreeShipment = freeShipmnetNum > 0 && carData.total >= freeShipmnetNum;
|
|
567
604
|
carData.shipment_fee = isFreeShipment
|
|
568
605
|
? 0
|
|
@@ -620,7 +657,7 @@ class CheckoutEvent {
|
|
|
620
657
|
await this.shopping.checkVoucher(carData);
|
|
621
658
|
checkPoint('check voucher');
|
|
622
659
|
let can_add_gift = [];
|
|
623
|
-
(
|
|
660
|
+
(_7 = carData.voucherList) === null || _7 === void 0 ? void 0 : _7.filter(dd => dd.reBackType === 'giveaway').forEach(dd => can_add_gift.push(dd.add_on_products));
|
|
624
661
|
gift_product.forEach(dd => {
|
|
625
662
|
const max_count = can_add_gift.filter(d1 => d1.includes(dd.id)).length;
|
|
626
663
|
if (max_count) {
|
|
@@ -632,7 +669,7 @@ class CheckoutEvent {
|
|
|
632
669
|
}
|
|
633
670
|
});
|
|
634
671
|
for (const giveawayData of carData.voucherList.filter(dd => dd.reBackType === 'giveaway')) {
|
|
635
|
-
if (!((
|
|
672
|
+
if (!((_8 = giveawayData.add_on_products) === null || _8 === void 0 ? void 0 : _8.length))
|
|
636
673
|
continue;
|
|
637
674
|
const productPromises = giveawayData.add_on_products
|
|
638
675
|
.map(async (id) => {
|
|
@@ -660,7 +697,7 @@ class CheckoutEvent {
|
|
|
660
697
|
appName: this.app,
|
|
661
698
|
key: 'glitter_finance',
|
|
662
699
|
});
|
|
663
|
-
const keyData = (
|
|
700
|
+
const keyData = (_9 = configData[0]) === null || _9 === void 0 ? void 0 : _9.value;
|
|
664
701
|
if (keyData) {
|
|
665
702
|
carData.payment_info_custom = keyData.payment_info_custom;
|
|
666
703
|
}
|
|
@@ -690,10 +727,10 @@ class CheckoutEvent {
|
|
|
690
727
|
}
|
|
691
728
|
});
|
|
692
729
|
checkPoint('set payment');
|
|
693
|
-
keyData.cash_on_delivery = (
|
|
730
|
+
keyData.cash_on_delivery = (_10 = keyData.cash_on_delivery) !== null && _10 !== void 0 ? _10 : { shipmentSupport: [] };
|
|
694
731
|
carData.payment_info_line_pay = keyData.payment_info_line_pay;
|
|
695
732
|
carData.payment_info_atm = keyData.payment_info_atm;
|
|
696
|
-
keyData.cash_on_delivery.shipmentSupport = (
|
|
733
|
+
keyData.cash_on_delivery.shipmentSupport = (_11 = keyData.cash_on_delivery.shipmentSupport) !== null && _11 !== void 0 ? _11 : [];
|
|
697
734
|
await this.setPaymentSetting({ carData: carData, checkoutPayment: checkoutPayment, keyData: keyData });
|
|
698
735
|
let subtotal = 0;
|
|
699
736
|
carData.lineItems.map(item => {
|
|
@@ -715,7 +752,7 @@ class CheckoutEvent {
|
|
|
715
752
|
const excludedValuesByTotal = new Set(['UNIMARTC2C', 'FAMIC2C', 'HILIFEC2C', 'OKMARTC2C']);
|
|
716
753
|
const excludedValuesByWeight = new Set(['normal', 'black_cat']);
|
|
717
754
|
const logisticsGroupResult = await userClass.getConfig({ key: 'logistics_group', user_id: 'manager' });
|
|
718
|
-
const logisticsGroup = (
|
|
755
|
+
const logisticsGroup = (_13 = (_12 = logisticsGroupResult[0]) === null || _12 === void 0 ? void 0 : _12.value) !== null && _13 !== void 0 ? _13 : [];
|
|
719
756
|
const isExcludedByTotal = (dd) => {
|
|
720
757
|
return carData.total > 20000 && excludedValuesByTotal.has(dd.value);
|
|
721
758
|
};
|
|
@@ -817,11 +854,12 @@ class CheckoutEvent {
|
|
|
817
854
|
macroLimited: 0,
|
|
818
855
|
microLimited: 0,
|
|
819
856
|
selectShipment: { type: 'all', list: [] },
|
|
857
|
+
distribution_shop: [],
|
|
820
858
|
};
|
|
821
859
|
carData.discount = data.discount;
|
|
822
860
|
carData.voucherList = [tempVoucher];
|
|
823
861
|
carData.customer_info = data.customer_info;
|
|
824
|
-
carData.total = (
|
|
862
|
+
carData.total = (_14 = data.total) !== null && _14 !== void 0 ? _14 : 0;
|
|
825
863
|
carData.rebate = tempVoucher.rebate_total;
|
|
826
864
|
if (tempVoucher.reBackType == 'shipment_free' || type == 'split') {
|
|
827
865
|
carData.shipment_fee = 0;
|
|
@@ -866,7 +904,7 @@ class CheckoutEvent {
|
|
|
866
904
|
if (checkOutType === 'POS' && Array.isArray(data.voucherList)) {
|
|
867
905
|
const manualVoucher = data.voucherList.find((item) => item.id === 0);
|
|
868
906
|
if (manualVoucher) {
|
|
869
|
-
manualVoucher.discount = (
|
|
907
|
+
manualVoucher.discount = (_15 = manualVoucher.discount_total) !== null && _15 !== void 0 ? _15 : 0;
|
|
870
908
|
carData.total -= manualVoucher.discount;
|
|
871
909
|
carData.discount += manualVoucher.discount;
|
|
872
910
|
carData.voucherList.push(manualVoucher);
|
|
@@ -898,15 +936,15 @@ class CheckoutEvent {
|
|
|
898
936
|
console.error(e);
|
|
899
937
|
}
|
|
900
938
|
}
|
|
939
|
+
await trans.commit();
|
|
940
|
+
await trans.release();
|
|
941
|
+
await Promise.all(saveStockArray.map(dd => dd()));
|
|
901
942
|
await order_event_js_1.OrderEvent.insertOrder({
|
|
902
943
|
cartData: carData,
|
|
903
944
|
status: data.pay_status,
|
|
904
945
|
app: this.app,
|
|
905
946
|
});
|
|
906
|
-
await
|
|
907
|
-
await trans.release();
|
|
908
|
-
await Promise.all(saveStockArray.map(dd => dd()));
|
|
909
|
-
await this.shopping.releaseCheckout((_15 = data.pay_status) !== null && _15 !== void 0 ? _15 : 0, carData.orderID);
|
|
947
|
+
await this.shopping.releaseCheckout((_16 = data.pay_status) !== null && _16 !== void 0 ? _16 : 0, carData.orderID);
|
|
910
948
|
checkPoint('release pos checkout');
|
|
911
949
|
for (const email of new Set([carData.customer_info, carData.user_info].map(dd => {
|
|
912
950
|
return dd && dd.email;
|
|
@@ -960,7 +998,7 @@ class CheckoutEvent {
|
|
|
960
998
|
appName: this.app,
|
|
961
999
|
key: 'glitter_finance',
|
|
962
1000
|
}))[0].value;
|
|
963
|
-
let kd = (
|
|
1001
|
+
let kd = (_17 = keyData[carData.customer_info.payment_select]) !== null && _17 !== void 0 ? _17 : {
|
|
964
1002
|
ReturnURL: '',
|
|
965
1003
|
NotifyURL: '',
|
|
966
1004
|
};
|
|
@@ -1035,10 +1073,10 @@ class CheckoutEvent {
|
|
|
1035
1073
|
await sns.sendCustomerSns('auto-sns-order-create', carData.orderID, phone);
|
|
1036
1074
|
console.info('訂單簡訊寄送成功');
|
|
1037
1075
|
}
|
|
1038
|
-
console.log(
|
|
1076
|
+
console.log('carData.customer_info -- ', carData.customer_info);
|
|
1039
1077
|
if (carData.customer_info.lineID) {
|
|
1040
1078
|
let line = new line_message_js_1.LineMessage(this.app);
|
|
1041
|
-
console.log(
|
|
1079
|
+
console.log('here -- OK');
|
|
1042
1080
|
await line.sendCustomerLine('auto-line-order-create', carData.orderID, carData.customer_info.lineID);
|
|
1043
1081
|
console.info('訂單line訊息寄送成功');
|
|
1044
1082
|
}
|