@things-factory/operato-hub 4.3.187 → 4.3.188
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/config.development.js +1 -1
- package/dist-server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.js +12 -3
- package/dist-server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.js.map +1 -1
- package/package.json +4 -4
- package/server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.ts +25 -7
package/config.development.js
CHANGED
|
@@ -51,6 +51,13 @@ exports.sellercraftPackMarketplaceOrderResolver = {
|
|
|
51
51
|
let releaseGoodsWithoutPackageId = await releaseGoodQb.getMany();
|
|
52
52
|
if ((releaseGoodsWithoutPackageId === null || releaseGoodsWithoutPackageId === void 0 ? void 0 : releaseGoodsWithoutPackageId.length) > 0) {
|
|
53
53
|
await Promise.all(releaseGoodsWithoutPackageId.map(async (releaseGood) => {
|
|
54
|
+
if ((releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.lastMarketPackCall) &&
|
|
55
|
+
worksheet_base_1.DateTimeDifference.timeDifferenceInSeconds(releaseGood.lastMarketPackCall, new Date()) <= 5) {
|
|
56
|
+
return false;
|
|
57
|
+
}
|
|
58
|
+
await (0, typeorm_1.getRepository)(sales_base_1.ReleaseGood).update({ id: releaseGood.id }, {
|
|
59
|
+
lastMarketPackCall: new Date()
|
|
60
|
+
});
|
|
54
61
|
await (0, typeorm_1.getConnection)().transaction(async (tx2) => {
|
|
55
62
|
try {
|
|
56
63
|
const orderProducts = releaseGood.orderProducts;
|
|
@@ -72,9 +79,11 @@ exports.sellercraftPackMarketplaceOrderResolver = {
|
|
|
72
79
|
(0, integration_base_1.createPayloadLog)(sellercraft.accountId, `/order/pack`, orderInformation, JSON.stringify(orderPack), { state: { domain: releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.domain, user: null } }, integration_base_1.PayloadType.EGESTION, 'scheduler');
|
|
73
80
|
if (orderPack === null || orderPack === void 0 ? void 0 : orderPack.packages) {
|
|
74
81
|
const packages = orderPack.packages;
|
|
75
|
-
await tx2
|
|
76
|
-
.
|
|
77
|
-
|
|
82
|
+
await tx2.getRepository(sales_base_1.ReleaseGood).update({ id: releaseGood.id }, {
|
|
83
|
+
packageId: packages[0].packageId,
|
|
84
|
+
lastMarketPackCall: new Date(),
|
|
85
|
+
updatedAt: new Date()
|
|
86
|
+
});
|
|
78
87
|
for (let idx = 0; idx < packages.length; idx++) {
|
|
79
88
|
let pkg = packages[idx];
|
|
80
89
|
const items = pkg.items;
|
package/dist-server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sellercraft-pack-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"sellercraft-pack-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-hub",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.188",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -90,7 +90,7 @@
|
|
|
90
90
|
"@things-factory/pdf": "^4.3.159",
|
|
91
91
|
"@things-factory/product-ui": "^4.3.187",
|
|
92
92
|
"@things-factory/resource-ui": "^4.3.179",
|
|
93
|
-
"@things-factory/sales-base": "^4.3.
|
|
93
|
+
"@things-factory/sales-base": "^4.3.188",
|
|
94
94
|
"@things-factory/scene-data-transform": "^4.3.159",
|
|
95
95
|
"@things-factory/scene-excel": "^4.3.159",
|
|
96
96
|
"@things-factory/scene-firebase": "^4.3.159",
|
|
@@ -106,7 +106,7 @@
|
|
|
106
106
|
"@things-factory/shell": "^4.3.179",
|
|
107
107
|
"@things-factory/system-ui": "^4.3.179",
|
|
108
108
|
"@things-factory/warehouse-base": "^4.3.187",
|
|
109
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
109
|
+
"@things-factory/worksheet-base": "^4.3.188",
|
|
110
110
|
"cron-parser": "^4.7.0",
|
|
111
111
|
"koa2-swagger-ui": "^5.0.2",
|
|
112
112
|
"swagger-jsdoc": "^5.0.0",
|
|
@@ -118,5 +118,5 @@
|
|
|
118
118
|
"resolutions": {
|
|
119
119
|
"core-js": "^3.16.0"
|
|
120
120
|
},
|
|
121
|
-
"gitHead": "
|
|
121
|
+
"gitHead": "e302836bb0f2a765c54e5cac96e82b7c7ace86fe"
|
|
122
122
|
}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { getConnection } from 'typeorm'
|
|
1
|
+
import { getConnection, getRepository } from 'typeorm'
|
|
2
2
|
|
|
3
3
|
import { Bizplace } from '@things-factory/biz-base'
|
|
4
4
|
import { logger } from '@things-factory/env'
|
|
@@ -14,10 +14,10 @@ import {
|
|
|
14
14
|
ReleaseGood
|
|
15
15
|
} from '@things-factory/sales-base'
|
|
16
16
|
import { Domain } from '@things-factory/shell'
|
|
17
|
-
import { Worksheet } from '@things-factory/worksheet-base'
|
|
17
|
+
import { DateTimeDifference, Worksheet } from '@things-factory/worksheet-base'
|
|
18
18
|
|
|
19
19
|
export const sellercraftPackMarketplaceOrderResolver = {
|
|
20
|
-
async sellercraftPackMarketplaceOrder(_: void, {
|
|
20
|
+
async sellercraftPackMarketplaceOrder(_: void, {}, context: any): Promise<void> {
|
|
21
21
|
try {
|
|
22
22
|
await getConnection().transaction(async tx => {
|
|
23
23
|
const sellercrafts: Sellercraft[] = await tx
|
|
@@ -64,6 +64,20 @@ export const sellercraftPackMarketplaceOrderResolver = {
|
|
|
64
64
|
if (releaseGoodsWithoutPackageId?.length > 0) {
|
|
65
65
|
await Promise.all(
|
|
66
66
|
releaseGoodsWithoutPackageId.map(async releaseGood => {
|
|
67
|
+
if (
|
|
68
|
+
releaseGood?.lastMarketPackCall &&
|
|
69
|
+
DateTimeDifference.timeDifferenceInSeconds(releaseGood.lastMarketPackCall, new Date()) <= 5
|
|
70
|
+
) {
|
|
71
|
+
return false
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
await getRepository(ReleaseGood).update(
|
|
75
|
+
{ id: releaseGood.id },
|
|
76
|
+
{
|
|
77
|
+
lastMarketPackCall: new Date()
|
|
78
|
+
}
|
|
79
|
+
)
|
|
80
|
+
|
|
67
81
|
await getConnection().transaction(async tx2 => {
|
|
68
82
|
try {
|
|
69
83
|
const orderProducts: OrderProduct[] = releaseGood.orderProducts
|
|
@@ -103,9 +117,14 @@ export const sellercraftPackMarketplaceOrderResolver = {
|
|
|
103
117
|
if (orderPack?.packages) {
|
|
104
118
|
const packages: any[] = orderPack.packages
|
|
105
119
|
|
|
106
|
-
await tx2
|
|
107
|
-
.
|
|
108
|
-
|
|
120
|
+
await tx2.getRepository(ReleaseGood).update(
|
|
121
|
+
{ id: releaseGood.id },
|
|
122
|
+
{
|
|
123
|
+
packageId: packages[0].packageId,
|
|
124
|
+
lastMarketPackCall: new Date(),
|
|
125
|
+
updatedAt: new Date()
|
|
126
|
+
}
|
|
127
|
+
)
|
|
109
128
|
|
|
110
129
|
for (let idx = 0; idx < packages.length; idx++) {
|
|
111
130
|
let pkg = packages[idx]
|
|
@@ -147,7 +166,6 @@ export const sellercraftPackMarketplaceOrderResolver = {
|
|
|
147
166
|
logger.error(`sellercraftPackMarketplaceOrder: ${e}`)
|
|
148
167
|
await tx2.getRepository(ReleaseGood).update({ id: releaseGood.id }, { packOrderFail: true })
|
|
149
168
|
}
|
|
150
|
-
|
|
151
169
|
})
|
|
152
170
|
})
|
|
153
171
|
)
|