@things-factory/marketplace-base 4.3.122 → 4.3.126
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/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.js +16 -0
- package/dist-server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-orders-by-platform.js +7 -1
- package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-orders-by-platform.js.map +1 -1
- package/dist-server/graphql/resolvers/marketplace-order/sync-shopee-awb.js +8 -4
- package/dist-server/graphql/resolvers/marketplace-order/sync-shopee-awb.js.map +1 -1
- package/dist-server/graphql/types/marketplace-order/index.js +1 -1
- package/package.json +4 -4
- package/server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.ts +16 -0
- package/server/graphql/resolvers/marketplace-order/sync-marketplace-orders-by-platform.ts +10 -5
- package/server/graphql/resolvers/marketplace-order/sync-shopee-awb.ts +7 -4
- package/server/graphql/types/marketplace-order/index.ts +1 -1
package/dist-server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.js
CHANGED
|
@@ -2,12 +2,14 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.initialiseLazadaLogisticsByBatch = void 0;
|
|
4
4
|
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
5
|
+
const env_1 = require("@things-factory/env");
|
|
5
6
|
const entities_1 = require("../../../entities");
|
|
6
7
|
exports.initialiseLazadaLogisticsByBatch = {
|
|
7
8
|
async initialiseLazadaLogisticsByBatch(_, { patches }, context) {
|
|
8
9
|
try {
|
|
9
10
|
const { domain, tx } = context.state;
|
|
10
11
|
await Promise.all(patches.map(async (patch) => {
|
|
12
|
+
var _a, _b, _c;
|
|
11
13
|
const foundMarketplaceOrder = await tx.getRepository(entities_1.MarketplaceOrder).findOne({
|
|
12
14
|
where: { id: patch.id },
|
|
13
15
|
relations: [
|
|
@@ -47,6 +49,20 @@ exports.initialiseLazadaLogisticsByBatch = {
|
|
|
47
49
|
shippingProvider: patch.shippingProvider
|
|
48
50
|
});
|
|
49
51
|
}
|
|
52
|
+
let ownTrackingNo = (_c = (_b = (_a = foundMarketplaceOrder === null || foundMarketplaceOrder === void 0 ? void 0 : foundMarketplaceOrder.marketplaceOrderItems[0]) === null || _a === void 0 ? void 0 : _a.marketplaceOrderShippingItems[0]) === null || _b === void 0 ? void 0 : _b.marketplaceOrderShipping) === null || _c === void 0 ? void 0 : _c.ownTrackingNo;
|
|
53
|
+
if (ownTrackingNo) {
|
|
54
|
+
try {
|
|
55
|
+
await integration_marketplace_1.StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, {
|
|
56
|
+
deliveryType: patch.deliveryType,
|
|
57
|
+
orderItemId: arrItemIds,
|
|
58
|
+
shipmentProvider: foundMarketplaceOrder.shippingProvider,
|
|
59
|
+
trackingNo: ownTrackingNo
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
catch (e) {
|
|
63
|
+
env_1.logger.error(`[initialiseLazadaLogisticsByBatch] - ${e.message}`);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
50
66
|
let updatedOrder = await integration_marketplace_1.StoreAPI.getStoreOrder(marketplaceStore, { orderId: patch.orderNo });
|
|
51
67
|
await tx.getRepository(entities_1.MarketplaceOrder).save(Object.assign(Object.assign({}, foundMarketplaceOrder), { status: updatedOrder.status, orderUpdatedAt: storeOrder.orderUpdatedAt }));
|
|
52
68
|
for (let idx = 0; idx < foundMarketplaceOrder.marketplaceOrderItems.length; idx++) {
|
package/dist-server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initialise-lazada-logistics-by-batch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.ts"],"names":[],"mappings":";;;AAAA,qFAAoF;
|
|
1
|
+
{"version":3,"file":"initialise-lazada-logistics-by-batch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/initialise-lazada-logistics-by-batch.ts"],"names":[],"mappings":"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"}
|
package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-orders-by-platform.js
CHANGED
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.syncMarketplaceOrdersByPlatform = void 0;
|
|
4
4
|
const typeorm_1 = require("typeorm");
|
|
5
5
|
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
6
|
+
const env_1 = require("@things-factory/env");
|
|
6
7
|
const sync_marketplace_order_1 = require("./sync-marketplace-order");
|
|
7
8
|
exports.syncMarketplaceOrdersByPlatform = {
|
|
8
9
|
async syncMarketplaceOrdersByPlatform(_, { fromCreatedDate, toCreatedDate, blackListStores }, context) {
|
|
@@ -14,7 +15,12 @@ exports.syncMarketplaceOrdersByPlatform = {
|
|
|
14
15
|
stores = stores.filter(store => blackListStores.indexOf(store.name) < 0);
|
|
15
16
|
}
|
|
16
17
|
for (let store of stores) {
|
|
17
|
-
|
|
18
|
+
try {
|
|
19
|
+
sync_marketplace_order_1.syncMarketplaceOrder.syncMarketplaceOrder(_, { storeId: store.id, fromCreatedDate, toCreatedDate, scheduler: true }, context);
|
|
20
|
+
}
|
|
21
|
+
catch (e) {
|
|
22
|
+
env_1.logger.error(`syncMarketplaceOrdersByPlatform: ${e.message}`);
|
|
23
|
+
}
|
|
18
24
|
}
|
|
19
25
|
return true;
|
|
20
26
|
}
|
package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-orders-by-platform.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-marketplace-orders-by-platform.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/sync-marketplace-orders-by-platform.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,qFAA0E;
|
|
1
|
+
{"version":3,"file":"sync-marketplace-orders-by-platform.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/sync-marketplace-orders-by-platform.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,qFAA0E;AAC1E,6CAA4C;AAE5C,qEAA+D;AAElD,QAAA,+BAA+B,GAAG;IAC7C,KAAK,CAAC,+BAA+B,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,aAAa,EAAE,eAAe,EAAE,EAAE,OAAY;QAC7G,IAAI,MAAM,GAAuB,MAAM,IAAA,uBAAa,EAAC,0CAAgB,CAAC,CAAC,IAAI,CAAC;YAC1E,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;SAC5B,CAAC,CAAA;QAEF,IAAI,eAAe,EAAE;YACnB,eAAe,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC5C,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAA;SACzE;QAED,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE;YACxB,IAAI;gBACF,6CAAoB,CAAC,oBAAoB,CACvC,CAAC,EACD,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,eAAe,EAAE,aAAa,EAAE,SAAS,EAAE,IAAI,EAAE,EACtE,OAAO,CACR,CAAA;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,YAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAA;aAC9D;SACF;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}
|
|
@@ -5,7 +5,7 @@ const typeorm_1 = require("typeorm");
|
|
|
5
5
|
const entities_1 = require("../../../entities");
|
|
6
6
|
const integration_marketplace_1 = require("@things-factory/integration-marketplace");
|
|
7
7
|
exports.syncShopeeAwb = {
|
|
8
|
-
async syncShopeeAwb(_, {}, context) {
|
|
8
|
+
async syncShopeeAwb(_, { storeId }, context) {
|
|
9
9
|
let marketplaceOrders = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrder)
|
|
10
10
|
.createQueryBuilder('mo')
|
|
11
11
|
.select('mo')
|
|
@@ -15,6 +15,7 @@ exports.syncShopeeAwb = {
|
|
|
15
15
|
.innerJoin('marketplace_order_shippings', 'mos', 'mo.name = mos.order_no_ref')
|
|
16
16
|
.where('ms.platform = :platform', { platform: 'shopee' })
|
|
17
17
|
.andWhere('ms.status = :ms_status', { ms_status: 'ACTIVE' })
|
|
18
|
+
.andWhere('ms.id = :storeId', { storeId })
|
|
18
19
|
.andWhere('ms.is_own_transport = false')
|
|
19
20
|
.andWhere('mo.status = :status', { status: 'processed' })
|
|
20
21
|
.andWhere('mos.airway_bill is null')
|
|
@@ -27,9 +28,12 @@ exports.syncShopeeAwb = {
|
|
|
27
28
|
});
|
|
28
29
|
}
|
|
29
30
|
catch (e) {
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
31
|
+
try {
|
|
32
|
+
await integration_marketplace_1.StoreAPI.createShippingDocument(marketplaceOrder.marketplaceStore, {
|
|
33
|
+
orderNo: marketplaceOrder.name
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
catch (e) { }
|
|
33
37
|
}
|
|
34
38
|
if (docResult) {
|
|
35
39
|
let downloadResult = await integration_marketplace_1.StoreAPI.getStoreOrderDocument(marketplaceOrder.marketplaceStore, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync-shopee-awb.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/sync-shopee-awb.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAC3D,gDAA8E;AAC9E,qFAAkE;AAErD,QAAA,aAAa,GAAG;IAC3B,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,EAAE,EAAE,OAAY;
|
|
1
|
+
{"version":3,"file":"sync-shopee-awb.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/sync-shopee-awb.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAC3D,gDAA8E;AAC9E,qFAAkE;AAErD,QAAA,aAAa,GAAG;IAC3B,KAAK,CAAC,aAAa,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,EAAE,OAAY;QACnD,IAAI,iBAAiB,GAAuB,MAAM,IAAA,uBAAa,EAAC,2BAAgB,CAAC;aAC9E,kBAAkB,CAAC,IAAI,CAAC;aACxB,MAAM,CAAC,IAAI,CAAC;aACZ,SAAS,CAAC,IAAI,CAAC;aACf,UAAU,CAAC,CAAC,SAAS,CAAC,CAAC;aACvB,SAAS,CAAC,qBAAqB,EAAE,IAAI,CAAC;aACtC,SAAS,CAAC,6BAA6B,EAAE,KAAK,EAAE,4BAA4B,CAAC;aAC7E,KAAK,CAAC,yBAAyB,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC;aACxD,QAAQ,CAAC,wBAAwB,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC;aAC3D,QAAQ,CAAC,kBAAkB,EAAE,EAAE,OAAO,EAAE,CAAC;aACzC,QAAQ,CAAC,6BAA6B,CAAC;aACvC,QAAQ,CAAC,qBAAqB,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;aACxD,QAAQ,CAAC,yBAAyB,CAAC;aACnC,OAAO,EAAE,CAAA;QAEZ,KAAK,IAAI,gBAAgB,IAAI,iBAAiB,EAAE;YAC9C,IAAI,SAAS,CAAA;YACb,IAAI;gBACF,SAAS,GAAG,MAAM,kCAAQ,CAAC,yBAAyB,CAAC,gBAAgB,CAAC,gBAAgB,EAAE;oBACtF,OAAO,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC;iBACjC,CAAC,CAAA;aACH;YAAC,OAAO,CAAC,EAAE;gBACV,IAAI;oBACF,MAAM,kCAAQ,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,gBAAgB,EAAE;wBACvE,OAAO,EAAE,gBAAgB,CAAC,IAAI;qBAC/B,CAAC,CAAA;iBACH;gBAAC,OAAM,CAAC,EAAE,GAAE;aACd;YACD,IAAI,SAAS,EAAE;gBACb,IAAI,cAAc,GAAG,MAAM,kCAAQ,CAAC,qBAAqB,CAAC,gBAAgB,CAAC,gBAAgB,EAAE;oBAC3F,QAAQ,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC;oBACjC,OAAO,EAAE,eAAe;iBACzB,CAAC,CAAA;gBACF,MAAM,IAAA,4BAAkB,GAAE;qBACvB,MAAM,CAAC,mCAAwB,CAAC;qBAChC,GAAG,CAAC,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;qBACjD,KAAK,CAAC,8BAA8B,EAAE,EAAE,YAAY,EAAE,gBAAgB,CAAC,IAAI,EAAE,CAAC;qBAC9E,OAAO,EAAE,CAAA;aACb;SACF;QACD,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}
|
|
@@ -64,7 +64,7 @@ exports.MarketplaceOrderResolver = (0, graphql_tag_1.default) `
|
|
|
64
64
|
deleteMarketplaceOrders(names: [String]!): Boolean
|
|
65
65
|
splitOrdersByBatch(patches: [LogisticsInfo]): Boolean @transaction
|
|
66
66
|
updateMarketplaceOrder(orderNo: String!, patch: MarketplaceOrderPatch!): MarketplaceOrder @transaction
|
|
67
|
-
syncShopeeAwb: Boolean @transaction
|
|
67
|
+
syncShopeeAwb(storeId: String!): Boolean @transaction
|
|
68
68
|
syncMarketplaceOrdersByPlatform(fromCreatedDate: String, toCreatedDate: String, blackListStores: String): Boolean
|
|
69
69
|
}
|
|
70
70
|
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/marketplace-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.126",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,10 +24,10 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/integration-fulfillment": "^4.3.
|
|
28
|
-
"@things-factory/integration-marketplace": "^4.3.
|
|
27
|
+
"@things-factory/integration-fulfillment": "^4.3.123",
|
|
28
|
+
"@things-factory/integration-marketplace": "^4.3.123",
|
|
29
29
|
"@things-factory/product-base": "^4.3.122",
|
|
30
30
|
"@things-factory/shell": "^4.3.122"
|
|
31
31
|
},
|
|
32
|
-
"gitHead": "
|
|
32
|
+
"gitHead": "4b44126b745e4d325a2105afab39957d1a9b8998"
|
|
33
33
|
}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { MarketplaceStore, StoreAPI } from '@things-factory/integration-marketplace'
|
|
2
|
+
import { logger } from '@things-factory/env'
|
|
2
3
|
|
|
3
4
|
import { MarketplaceOrder, MarketplaceOrderItem } from '../../../entities'
|
|
4
5
|
|
|
@@ -54,6 +55,21 @@ export const initialiseLazadaLogisticsByBatch = {
|
|
|
54
55
|
})
|
|
55
56
|
}
|
|
56
57
|
|
|
58
|
+
let ownTrackingNo = foundMarketplaceOrder?.marketplaceOrderItems[0]?.marketplaceOrderShippingItems[0]?.marketplaceOrderShipping?.ownTrackingNo
|
|
59
|
+
|
|
60
|
+
if (ownTrackingNo) {
|
|
61
|
+
try {
|
|
62
|
+
await StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, {
|
|
63
|
+
deliveryType: patch.deliveryType,
|
|
64
|
+
orderItemId: arrItemIds,
|
|
65
|
+
shipmentProvider: foundMarketplaceOrder.shippingProvider,
|
|
66
|
+
trackingNo: ownTrackingNo
|
|
67
|
+
})
|
|
68
|
+
} catch (e) {
|
|
69
|
+
logger.error(`[initialiseLazadaLogisticsByBatch] - ${e.message}`)
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
|
|
57
73
|
let updatedOrder = await StoreAPI.getStoreOrder(marketplaceStore, { orderId: patch.orderNo })
|
|
58
74
|
|
|
59
75
|
await tx.getRepository(MarketplaceOrder).save({
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { getRepository } from 'typeorm'
|
|
2
2
|
|
|
3
3
|
import { MarketplaceStore } from '@things-factory/integration-marketplace'
|
|
4
|
+
import { logger } from '@things-factory/env'
|
|
4
5
|
|
|
5
6
|
import { syncMarketplaceOrder } from './sync-marketplace-order'
|
|
6
7
|
|
|
@@ -16,11 +17,15 @@ export const syncMarketplaceOrdersByPlatform = {
|
|
|
16
17
|
}
|
|
17
18
|
|
|
18
19
|
for (let store of stores) {
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
try {
|
|
21
|
+
syncMarketplaceOrder.syncMarketplaceOrder(
|
|
22
|
+
_,
|
|
23
|
+
{ storeId: store.id, fromCreatedDate, toCreatedDate, scheduler: true },
|
|
24
|
+
context
|
|
25
|
+
)
|
|
26
|
+
} catch (e) {
|
|
27
|
+
logger.error(`syncMarketplaceOrdersByPlatform: ${e.message}`)
|
|
28
|
+
}
|
|
24
29
|
}
|
|
25
30
|
|
|
26
31
|
return true
|
|
@@ -3,7 +3,7 @@ import { MarketplaceOrder, MarketplaceOrderShipping } from '../../../entities'
|
|
|
3
3
|
import { StoreAPI } from '@things-factory/integration-marketplace'
|
|
4
4
|
|
|
5
5
|
export const syncShopeeAwb = {
|
|
6
|
-
async syncShopeeAwb(_: any, {}, context: any) {
|
|
6
|
+
async syncShopeeAwb(_: any, { storeId }, context: any) {
|
|
7
7
|
let marketplaceOrders: MarketplaceOrder[] = await getRepository(MarketplaceOrder)
|
|
8
8
|
.createQueryBuilder('mo')
|
|
9
9
|
.select('mo')
|
|
@@ -13,6 +13,7 @@ export const syncShopeeAwb = {
|
|
|
13
13
|
.innerJoin('marketplace_order_shippings', 'mos', 'mo.name = mos.order_no_ref')
|
|
14
14
|
.where('ms.platform = :platform', { platform: 'shopee' })
|
|
15
15
|
.andWhere('ms.status = :ms_status', { ms_status: 'ACTIVE' })
|
|
16
|
+
.andWhere('ms.id = :storeId', { storeId })
|
|
16
17
|
.andWhere('ms.is_own_transport = false')
|
|
17
18
|
.andWhere('mo.status = :status', { status: 'processed' })
|
|
18
19
|
.andWhere('mos.airway_bill is null')
|
|
@@ -25,9 +26,11 @@ export const syncShopeeAwb = {
|
|
|
25
26
|
orderNo: [marketplaceOrder.name]
|
|
26
27
|
})
|
|
27
28
|
} catch (e) {
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
29
|
+
try {
|
|
30
|
+
await StoreAPI.createShippingDocument(marketplaceOrder.marketplaceStore, {
|
|
31
|
+
orderNo: marketplaceOrder.name
|
|
32
|
+
})
|
|
33
|
+
} catch(e) {}
|
|
31
34
|
}
|
|
32
35
|
if (docResult) {
|
|
33
36
|
let downloadResult = await StoreAPI.getStoreOrderDocument(marketplaceOrder.marketplaceStore, {
|
|
@@ -46,7 +46,7 @@ export const MarketplaceOrderResolver = gql`
|
|
|
46
46
|
deleteMarketplaceOrders(names: [String]!): Boolean
|
|
47
47
|
splitOrdersByBatch(patches: [LogisticsInfo]): Boolean @transaction
|
|
48
48
|
updateMarketplaceOrder(orderNo: String!, patch: MarketplaceOrderPatch!): MarketplaceOrder @transaction
|
|
49
|
-
syncShopeeAwb: Boolean @transaction
|
|
49
|
+
syncShopeeAwb(storeId: String!): Boolean @transaction
|
|
50
50
|
syncMarketplaceOrdersByPlatform(fromCreatedDate: String, toCreatedDate: String, blackListStores: String): Boolean
|
|
51
51
|
}
|
|
52
52
|
|