@things-factory/operato-hub 4.3.125 → 4.3.127
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 +2 -2
- package/dist-server/graphql/resolvers/synchronization/auto-update-all-marketplace-product-variation-quantity.js +10 -0
- package/dist-server/graphql/resolvers/synchronization/auto-update-all-marketplace-product-variation-quantity.js.map +1 -1
- package/dist-server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.js +18 -9
- package/dist-server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.js.map +1 -1
- package/package.json +5 -5
- package/server/graphql/resolvers/synchronization/auto-update-all-marketplace-product-variation-quantity.ts +10 -0
- package/server/graphql/resolvers/synchronization/sellercraft-pack-marketplace-order.ts +19 -10
package/config.development.js
CHANGED
|
@@ -10,12 +10,12 @@ module.exports = {
|
|
|
10
10
|
name: 'default',
|
|
11
11
|
type: 'postgres',
|
|
12
12
|
database: 'dev3',
|
|
13
|
-
username: 'postgres',
|
|
13
|
+
username: 'postgres',
|
|
14
14
|
password: 'hatio',
|
|
15
15
|
host: '192.168.0.153',
|
|
16
16
|
port: 15432,
|
|
17
17
|
synchronize: true,
|
|
18
|
-
logging:
|
|
18
|
+
logging: false
|
|
19
19
|
},
|
|
20
20
|
// ormconfig: {
|
|
21
21
|
// name: 'default',
|
|
@@ -19,6 +19,7 @@ exports.autoUpdateAllMarketplaceProductVariationQuantityResolver = {
|
|
|
19
19
|
const fulfilmentCenter = await integration_fulfillment_1.FulfillmentAPI.getFulfillmentCenter(warehouseId);
|
|
20
20
|
const centerId = fulfilmentCenter.centerId;
|
|
21
21
|
const warehouseDomain = await (0, typeorm_1.getRepository)(shell_1.Domain).findOne({ where: { subdomain: centerId } });
|
|
22
|
+
let productLogs = [];
|
|
22
23
|
let products = await (0, typeorm_1.getRepository)(product_base_1.Product).find({
|
|
23
24
|
where: { domain: companyDomain },
|
|
24
25
|
relations: ['productDetails']
|
|
@@ -104,6 +105,12 @@ exports.autoUpdateAllMarketplaceProductVariationQuantityResolver = {
|
|
|
104
105
|
validMarketplaceDistributors = marketplaceStore.marketplaceDistributors.filter(distributor => distributor.status === 'ACTIVE');
|
|
105
106
|
}
|
|
106
107
|
const hasVariation = (_b = storeProductVariation === null || storeProductVariation === void 0 ? void 0 : storeProductVariation.marketplaceProduct) === null || _b === void 0 ? void 0 : _b.hasVariation;
|
|
108
|
+
productLogs.push({
|
|
109
|
+
itemId: storeProductVariation.marketplaceProduct.itemId,
|
|
110
|
+
variationId: storeProductVariation.variationId,
|
|
111
|
+
variationSku: storeProductVariation.variationSku,
|
|
112
|
+
qty: adjustQty
|
|
113
|
+
});
|
|
107
114
|
if (hasVariation) {
|
|
108
115
|
await integration_marketplace_1.StoreAPI.updateStoreProductVariationStock(marketplaceStore, [
|
|
109
116
|
{
|
|
@@ -142,6 +149,9 @@ exports.autoUpdateAllMarketplaceProductVariationQuantityResolver = {
|
|
|
142
149
|
catch (e) {
|
|
143
150
|
env_1.logger.error(`interface-with-hub[autoUpdateAllMarketplaceProductVariationQuantity]marketplaceStores: ${e === null || e === void 0 ? void 0 : e.message}`);
|
|
144
151
|
}
|
|
152
|
+
finally {
|
|
153
|
+
env_1.logger.info(`quantity_logs[autoUpdateAllMarketplaceProductVariationQuantity] - ${JSON.stringify(productLogs)}`);
|
|
154
|
+
}
|
|
145
155
|
}
|
|
146
156
|
return true;
|
|
147
157
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-update-all-marketplace-product-variation-quantity.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/auto-update-all-marketplace-product-variation-quantity.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AAEtD,6CAA4C;AAC5C,qFAAwE;AACxE,qFAAwG;AACxG,uEAA8E;AAC9E,+DAAqE;AACrE,iDAA8C;AAC9C,mEAAsH;AAEzG,QAAA,wDAAwD,GAAG;IACtE,KAAK,CAAC,gDAAgD,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,EAAE,OAAY;QAC3G,MAAM,aAAa,GAAW,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;QAElF,MAAM,iBAAiB,GAAuB,MAAM,IAAA,uBAAa,EAAC,0CAAgB,CAAC,CAAC,IAAI,CAAC;YACvF,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE;YAClD,SAAS,EAAE,CAAC,yBAAyB,CAAC;SACvC,CAAC,CAAA;QAEF,MAAM,gBAAgB,GAAG,MAAM,wCAAc,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;QAC/E,MAAM,QAAQ,GAAW,gBAAgB,CAAC,QAAQ,CAAA;QAClD,MAAM,eAAe,GAAW,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"auto-update-all-marketplace-product-variation-quantity.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/synchronization/auto-update-all-marketplace-product-variation-quantity.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AAEtD,6CAA4C;AAC5C,qFAAwE;AACxE,qFAAwG;AACxG,uEAA8E;AAC9E,+DAAqE;AACrE,iDAA8C;AAC9C,mEAAsH;AAEzG,QAAA,wDAAwD,GAAG;IACtE,KAAK,CAAC,gDAAgD,CAAC,CAAM,EAAE,EAAE,eAAe,EAAE,WAAW,EAAE,EAAE,OAAY;QAC3G,MAAM,aAAa,GAAW,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,eAAe,CAAC,CAAA;QAElF,MAAM,iBAAiB,GAAuB,MAAM,IAAA,uBAAa,EAAC,0CAAgB,CAAC,CAAC,IAAI,CAAC;YACvF,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE;YAClD,SAAS,EAAE,CAAC,yBAAyB,CAAC;SACvC,CAAC,CAAA;QAEF,MAAM,gBAAgB,GAAG,MAAM,wCAAc,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;QAC/E,MAAM,QAAQ,GAAW,gBAAgB,CAAC,QAAQ,CAAA;QAClD,MAAM,eAAe,GAAW,MAAM,IAAA,uBAAa,EAAC,cAAM,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;QACvG,IAAI,WAAW,GAAG,EAAE,CAAA;QAEpB,IAAI,QAAQ,GAAc,MAAM,IAAA,uBAAa,EAAC,sBAAO,CAAC,CAAC,IAAI,CAAC;YAC1D,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE;YAChC,SAAS,EAAE,CAAC,gBAAgB,CAAC;SAC9B,CAAC,CAAA;QAEF,IAAI,iBAAiB,GAAU,MAAM,OAAO,CAAC,GAAG,CAC9C,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAC,OAAO,EAAC,EAAE;YAC3B,MAAM,cAAc,GAAoB,OAAO,CAAC,cAAc,CAAA;YAC9D,MAAM,oBAAoB,GAAkB,cAAc,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;YAE9G,IAAI,EAAE,GAAG,MAAM,IAAA,uBAAa,EAAC,0BAAS,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;YACjE,EAAE,CAAC,iBAAiB,CAAC,cAAc,EAAE,KAAK,CAAC;iBACxC,QAAQ,CAAC,+BAA+B,CAAC;iBACzC,QAAQ,CAAC,iCAAiC,CAAC;iBAC3C,QAAQ,CAAC,2BAA2B,CAAC;iBACrC,QAAQ,CAAC,yCAAyC,CAAC;iBACnD,aAAa,CAAC;gBACb,QAAQ,EAAE,eAAe,CAAC,EAAE;gBAC5B,SAAS,EAAE,OAAO,CAAC,EAAE;gBACrB,MAAM,EAAE,iCAAgB,CAAC,UAAU;gBACnC,aAAa,EAAE,CAAC,8BAAa,CAAC,UAAU,EAAE,8BAAa,CAAC,OAAO,CAAC;aACjE,CAAC,CAAA;YAEJ,IAAI,WAAW,GAAgB,MAAM,EAAE,CAAC,OAAO,EAAE,CAAA;YAEjD,MAAM,YAAY,GAAW,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE;gBACtE,KAAK,IAAI,YAAY,CAAC,GAAG,CAAA;gBACzB,OAAO,KAAK,CAAA;YACd,CAAC,EAAE,CAAC,CAAC,CAAA;YAEL,MAAM,kBAAkB,GAAW,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE;gBAC5E,KAAK,IAAI,YAAY,CAAC,SAAS,CAAA;gBAC/B,OAAO,KAAK,CAAA;YACd,CAAC,EAAE,CAAC,CAAC,CAAA;YAEL,OAAO;gBACL,OAAO;gBACP,GAAG,EAAE,OAAO,CAAC,GAAG;gBAChB,IAAI,EAAE,OAAO,CAAC,IAAI;gBAClB,WAAW,EAAE,oBAAoB,CAAC,WAAW;gBAC7C,WAAW,EAAE,oBAAoB,CAAC,WAAW;gBAC7C,GAAG,EAAE,oBAAoB,CAAC,GAAG;gBAC7B,GAAG,EAAE,YAAY,GAAG,kBAAkB;aACvC,CAAA;QACH,CAAC,CAAC,CACH,CAAA;QAED,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAC3C,IAAI,wBAAwB,GAAU,MAAM,IAAA,0CAAyB,EACnE,eAAe,EACf,aAAa,EACb,iBAAiB,EACjB,EAAE,CACH,CAAA;YAED,wBAAwB,CAAC,GAAG,CAAC,sBAAsB,CAAC,EAAE;gBACpD,iBAAiB,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAA;YAChD,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjD,IAAI;gBACF,MAAM,gBAAgB,GAAqB,iBAAiB,CAAC,CAAC,CAAC,CAAA;gBAE/D,MAAM,kBAAkB,GAAuB,MAAM,IAAA,uBAAa,EAAC,4CAAkB,CAAC,CAAC,OAAO,CAAC;oBAC7F,KAAK,EAAE,EAAE,gBAAgB,EAAE,QAAQ,EAAE,kBAAkB,EAAE;iBAC1D,CAAC,CAAA;gBAEF,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACjD,IAAI;wBACF,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;;4BAC3C,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAA;4BAC7C,MAAM,4BAA4B,GAAkC,MAAM,EAAE;iCACzE,aAAa,CAAC,8CAA2B,CAAC;iCAC1C,IAAI,CAAC;gCACJ,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,gBAAgB,CAAC,GAAG,EAAE;gCAC3D,SAAS,EAAE,CAAC,oBAAoB,EAAE,qCAAqC,CAAC;6BACzE,CAAC,CAAA;4BAEJ,IAAI,sBAAsB,GAAkC,4BAA4B,CAAC,MAAM,CAC7F,gBAAgB,CAAC,EAAE,CAAC,gBAAgB,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,EAAE,KAAK,gBAAgB,CAAC,EAAE,CACpG,CAAA;4BAED,IAAI,eAAe,GAAW,GAAG,CAAA;4BACjC,IAAI,sBAAsB,EAAE;gCAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,sBAAsB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oCACtD,IAAI,qBAAqB,GAAgC,sBAAsB,CAAC,CAAC,CAAC,CAAA;oCAClF,IAAI,kBAAkB,EAAE;wCACtB,eAAe,GAAG,QAAQ,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;qCACrD;oCAED,IAAI,SAAS,GAAW,IAAI,CAAC,KAAK,CAChC,CAAC,gBAAgB,CAAC,GAAG,GAAG,qBAAqB,CAAC,UAAU,CAAC,GAAG,CAAC,eAAe,GAAG,GAAG,CAAC,CACpF,CAAA;oCACD,IAAI,SAAS,GAAG,CAAC;wCAAE,SAAS,GAAG,CAAC,CAAA;oCAEhC,IAAI,0BAA0B,GAAG,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,UAAU,CAAA;oCAClE,IAAI,SAAS,GAAW,SAAS,CAAA;oCAEjC,IAAI,gBAAgB,CAAC,QAAQ,KAAK,SAAS,EAAE;wCAC3C,IAAI,WAAW,GAAU,IAAI,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAA;wCAC/D,SAAS,GAAG,SAAS,GAAG,qBAAqB,CAAC,GAAG,CAAA;wCACjD,IAAI,MAAA,WAAW,CAAC,CAAC,CAAC,0CAAE,WAAW;4CAAE,0BAA0B,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAA;qCACzF;oCAED,IAAI,4BAA4B,GAAU,EAAE,CAAA;oCAC5C,IAAI,gBAAgB,CAAC,uBAAuB,EAAE;wCAC5C,4BAA4B,GAAG,gBAAgB,CAAC,uBAAuB,CAAC,MAAM,CAC5E,WAAW,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,KAAK,QAAQ,CAC/C,CAAA;qCACF;oCAED,MAAM,YAAY,GAAY,MAAA,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAE,kBAAkB,0CAAE,YAAY,CAAA;oCAErF,WAAW,CAAC,IAAI,CAAC;wCACf,MAAM,EAAE,qBAAqB,CAAC,kBAAkB,CAAC,MAAM;wCACvD,WAAW,EAAE,qBAAqB,CAAC,WAAW;wCAC9C,YAAY,EAAE,qBAAqB,CAAC,YAAY;wCAChD,GAAG,EAAE,SAAS;qCACf,CAAC,CAAA;oCAEF,IAAI,YAAY,EAAE;wCAChB,MAAM,kCAAQ,CAAC,gCAAgC,CAAC,gBAAgB,EAAE;4CAChE;gDACE,MAAM,EAAE,qBAAqB,CAAC,kBAAkB,CAAC,MAAM;gDACvD,WAAW,EAAE,qBAAqB,CAAC,WAAW;gDAC9C,YAAY,EAAE,qBAAqB,CAAC,YAAY;gDAChD,GAAG,EAAE,SAAS;gDACd,UAAU,EAAE,0BAA0B;gDACtC,eAAe,EAAE,qBAAqB,CAAC,eAAe;gDACtD,YAAY,EAAE,4BAA4B;6CAC3C;yCACF,CAAC,CAAA;qCACH;yCAAM;wCACL,MAAM,kCAAQ,CAAC,uBAAuB,CAAC,gBAAgB,EAAE;4CACvD;gDACE,MAAM,EAAE,qBAAqB,CAAC,kBAAkB,CAAC,MAAM;gDACvD,WAAW,EAAE,qBAAqB,CAAC,WAAW;gDAC9C,YAAY,EAAE,qBAAqB,CAAC,YAAY;gDAChD,GAAG,EAAE,SAAS;gDACd,YAAY,EAAE,4BAA4B;6CAC3C;yCACF,CAAC,CAAA;qCACH;oCAED,qBAAqB,CAAC,GAAG,GAAG,SAAS,CAAA;oCACrC,MAAM,EAAE,CAAC,aAAa,CAAC,8CAA2B,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;iCAChF;6BACF;wBACH,CAAC,CAAC,CAAA;qBACH;oBAAC,OAAO,KAAK,EAAE;wBACd,YAAM,CAAC,KAAK,CACV,0FAA0F,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,EAAE,CAC3G,CAAA;qBACF;iBACF;aACF;YAAC,OAAO,CAAC,EAAE;gBACV,YAAM,CAAC,KAAK,CAAC,0FAA0F,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,OAAO,EAAE,CAAC,CAAA;aACrH;oBAAS;gBACR,YAAM,CAAC,IAAI,CAAC,qEAAqE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;aAChH;SACF;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}
|
|
@@ -7,6 +7,7 @@ const biz_base_1 = require("@things-factory/biz-base");
|
|
|
7
7
|
const env_1 = require("@things-factory/env");
|
|
8
8
|
const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
|
|
9
9
|
const sales_base_1 = require("@things-factory/sales-base");
|
|
10
|
+
const worksheet_base_1 = require("@things-factory/worksheet-base");
|
|
10
11
|
exports.sellercraftPackMarketplaceOrderResolver = {
|
|
11
12
|
async sellercraftPackMarketplaceOrder(_, {}, context) {
|
|
12
13
|
try {
|
|
@@ -20,15 +21,23 @@ exports.sellercraftPackMarketplaceOrderResolver = {
|
|
|
20
21
|
const bizplace = await tx
|
|
21
22
|
.getRepository(biz_base_1.Bizplace)
|
|
22
23
|
.findOne({ where: { domain: sellercraftDomain } });
|
|
23
|
-
let releaseGoodsWithoutPackageId = await tx.getRepository(sales_base_1.ReleaseGood).
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
|
|
24
|
+
let releaseGoodsWithoutPackageId = await tx.getRepository(sales_base_1.ReleaseGood).createQueryBuilder('rg')
|
|
25
|
+
.innerJoinAndSelect('rg.orderProducts', 'op')
|
|
26
|
+
.innerJoinAndSelect('op.product', 'prd')
|
|
27
|
+
.where(`rg.bizplace_id = :bizplaceId`, { bizplaceId: bizplace.id })
|
|
28
|
+
.andWhere(`rg.type = :rgType`, { rgType: 'b2c' })
|
|
29
|
+
.andWhere(`rg.package_id IS NULL`)
|
|
30
|
+
.andWhere(`rg.status NOT IN(:...status) `, { status: [sales_base_1.ORDER_STATUS.CANCELLED, sales_base_1.ORDER_STATUS.PENDING_CANCEL, sales_base_1.ORDER_STATUS.DONE] })
|
|
31
|
+
.andWhere(qb => {
|
|
32
|
+
const subQuery = qb
|
|
33
|
+
.subQuery()
|
|
34
|
+
.from(worksheet_base_1.Worksheet, 'ws')
|
|
35
|
+
.where('rg.id = ws.release_good_id')
|
|
36
|
+
.andWhere('ws.type = :wsType', { wsType: 'PICKING' })
|
|
37
|
+
.getQuery();
|
|
38
|
+
return 'EXISTS ' + subQuery;
|
|
39
|
+
})
|
|
40
|
+
.getMany();
|
|
32
41
|
if ((releaseGoodsWithoutPackageId === null || releaseGoodsWithoutPackageId === void 0 ? void 0 : releaseGoodsWithoutPackageId.length) > 0) {
|
|
33
42
|
await Promise.all(releaseGoodsWithoutPackageId.map(async (releaseGood) => {
|
|
34
43
|
const orderProducts = releaseGood.orderProducts;
|
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,qCAAwD;AACxD,uEAAgF;AAEhF,uDAAmD;AACnD,6CAA4C;AAC5C,qFAAwG;AAExG,2DAAoF;
|
|
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.127",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -91,7 +91,7 @@
|
|
|
91
91
|
"@things-factory/pdf": "^4.3.122",
|
|
92
92
|
"@things-factory/product-ui": "^4.3.123",
|
|
93
93
|
"@things-factory/resource-ui": "^4.3.123",
|
|
94
|
-
"@things-factory/sales-base": "^4.3.
|
|
94
|
+
"@things-factory/sales-base": "^4.3.127",
|
|
95
95
|
"@things-factory/scene-data-transform": "^4.3.122",
|
|
96
96
|
"@things-factory/scene-excel": "^4.3.122",
|
|
97
97
|
"@things-factory/scene-firebase": "^4.3.122",
|
|
@@ -106,8 +106,8 @@
|
|
|
106
106
|
"@things-factory/setting-ui": "^4.3.123",
|
|
107
107
|
"@things-factory/shell": "^4.3.122",
|
|
108
108
|
"@things-factory/system-ui": "^4.3.122",
|
|
109
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
110
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
109
|
+
"@things-factory/warehouse-base": "^4.3.127",
|
|
110
|
+
"@things-factory/worksheet-base": "^4.3.127",
|
|
111
111
|
"koa2-swagger-ui": "^5.0.2",
|
|
112
112
|
"swagger-jsdoc": "^5.0.0",
|
|
113
113
|
"yamljs": "^0.3.0"
|
|
@@ -118,5 +118,5 @@
|
|
|
118
118
|
"resolutions": {
|
|
119
119
|
"core-js": "^3.16.0"
|
|
120
120
|
},
|
|
121
|
-
"gitHead": "
|
|
121
|
+
"gitHead": "ed6406fce1541dd5ca6a7508047934e8fa5698b1"
|
|
122
122
|
}
|
|
@@ -20,6 +20,7 @@ export const autoUpdateAllMarketplaceProductVariationQuantityResolver = {
|
|
|
20
20
|
const fulfilmentCenter = await FulfillmentAPI.getFulfillmentCenter(warehouseId)
|
|
21
21
|
const centerId: string = fulfilmentCenter.centerId
|
|
22
22
|
const warehouseDomain: Domain = await getRepository(Domain).findOne({ where: { subdomain: centerId } })
|
|
23
|
+
let productLogs = []
|
|
23
24
|
|
|
24
25
|
let products: Product[] = await getRepository(Product).find({
|
|
25
26
|
where: { domain: companyDomain },
|
|
@@ -135,6 +136,13 @@ export const autoUpdateAllMarketplaceProductVariationQuantityResolver = {
|
|
|
135
136
|
|
|
136
137
|
const hasVariation: boolean = storeProductVariation?.marketplaceProduct?.hasVariation
|
|
137
138
|
|
|
139
|
+
productLogs.push({
|
|
140
|
+
itemId: storeProductVariation.marketplaceProduct.itemId,
|
|
141
|
+
variationId: storeProductVariation.variationId,
|
|
142
|
+
variationSku: storeProductVariation.variationSku,
|
|
143
|
+
qty: adjustQty
|
|
144
|
+
})
|
|
145
|
+
|
|
138
146
|
if (hasVariation) {
|
|
139
147
|
await StoreAPI.updateStoreProductVariationStock(marketplaceStore, [
|
|
140
148
|
{
|
|
@@ -172,6 +180,8 @@ export const autoUpdateAllMarketplaceProductVariationQuantityResolver = {
|
|
|
172
180
|
}
|
|
173
181
|
} catch (e) {
|
|
174
182
|
logger.error(`interface-with-hub[autoUpdateAllMarketplaceProductVariationQuantity]marketplaceStores: ${e?.message}`)
|
|
183
|
+
} finally {
|
|
184
|
+
logger.info(`quantity_logs[autoUpdateAllMarketplaceProductVariationQuantity] - ${JSON.stringify(productLogs)}`)
|
|
175
185
|
}
|
|
176
186
|
}
|
|
177
187
|
|
|
@@ -6,10 +6,11 @@ import { logger } from '@things-factory/env'
|
|
|
6
6
|
import { Sellercraft, SellercraftAPI, SellercraftStatus } from '@things-factory/integration-sellercraft'
|
|
7
7
|
import { Product } from '@things-factory/product-base'
|
|
8
8
|
import { ORDER_STATUS, OrderProduct, ReleaseGood } from '@things-factory/sales-base'
|
|
9
|
+
import { Worksheet } from '@things-factory/worksheet-base'
|
|
9
10
|
import { Domain } from '@things-factory/shell'
|
|
10
11
|
|
|
11
12
|
export const sellercraftPackMarketplaceOrderResolver = {
|
|
12
|
-
async sellercraftPackMarketplaceOrder(_: void, {}, context: any): Promise<void> {
|
|
13
|
+
async sellercraftPackMarketplaceOrder(_: void, { }, context: any): Promise<void> {
|
|
13
14
|
try {
|
|
14
15
|
await getConnection().transaction(async tx => {
|
|
15
16
|
const sellercrafts: Sellercraft[] = await tx
|
|
@@ -23,15 +24,23 @@ export const sellercraftPackMarketplaceOrderResolver = {
|
|
|
23
24
|
.getRepository(Bizplace)
|
|
24
25
|
.findOne({ where: { domain: sellercraftDomain } })
|
|
25
26
|
|
|
26
|
-
let releaseGoodsWithoutPackageId: ReleaseGood[] = await tx.getRepository(ReleaseGood).
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
|
|
27
|
+
let releaseGoodsWithoutPackageId: ReleaseGood[] = await tx.getRepository(ReleaseGood).createQueryBuilder('rg')
|
|
28
|
+
.innerJoinAndSelect('rg.orderProducts', 'op')
|
|
29
|
+
.innerJoinAndSelect('op.product', 'prd')
|
|
30
|
+
.where(`rg.bizplace_id = :bizplaceId`, { bizplaceId: bizplace.id })
|
|
31
|
+
.andWhere(`rg.type = :rgType`, { rgType: 'b2c' })
|
|
32
|
+
.andWhere(`rg.package_id IS NULL`)
|
|
33
|
+
.andWhere(`rg.status NOT IN(:...status) `, { status: [ORDER_STATUS.CANCELLED, ORDER_STATUS.PENDING_CANCEL, ORDER_STATUS.DONE] })
|
|
34
|
+
.andWhere(qb => {
|
|
35
|
+
const subQuery = qb
|
|
36
|
+
.subQuery()
|
|
37
|
+
.from(Worksheet, 'ws')
|
|
38
|
+
.where('rg.id = ws.release_good_id')
|
|
39
|
+
.andWhere('ws.type = :wsType', { wsType: 'PICKING' })
|
|
40
|
+
.getQuery()
|
|
41
|
+
return 'EXISTS ' + subQuery
|
|
42
|
+
})
|
|
43
|
+
.getMany()
|
|
35
44
|
|
|
36
45
|
if (releaseGoodsWithoutPackageId?.length > 0) {
|
|
37
46
|
await Promise.all(
|