npm - @things-factory/marketplace-base - Versions diffs - 3.7.10 → 3.8.3 - Mend

@things-factory/marketplace-base 3.7.10 → 3.8.3

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 (28) hide show

package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js CHANGED Viewed

@@ -31,6 +31,7 @@ exports.syncMarketplaceOrder = {
                 let marketplaceOrderItems = [];
                 let tracking_code = '';
                 let deliveryProvider;
+                let dropPickProvider;
                 if (marketplaceStore.platform == 'lazada') {
                     if (order.trackingNo != '') {
                         tracking_code = JSON.parse(order.trackingNo)
@@ -47,7 +48,10 @@ exports.syncMarketplaceOrder = {
                         var [key, value] = s.split(': ');
                         shippingProviderInfo[key] = value;
                     });
-                    deliveryProvider = shippingProviderInfo.Delivery;
+                    dropPickProvider = (shippingProviderInfo === null || shippingProviderInfo === void 0 ? void 0 : shippingProviderInfo.Pickup)
+                        ? shippingProviderInfo['Pickup']
+                        : shippingProviderInfo['Drop-off'];
+                    deliveryProvider = shippingProviderInfo['Delivery'];
                 }
                 let marketplaceOrder = new entities_1.MarketplaceOrder();
                 marketplaceOrder.name = order.name;
@@ -64,6 +68,14 @@ exports.syncMarketplaceOrder = {
                 marketplaceOrder.domain = marketplaceStore.domain;
                 marketplaceOrder.buyerUsername = order.buyerUsername;
                 marketplaceOrder.payTime = order.payTime;
+                marketplaceOrder.serviceFee = order.serviceFee;
+                marketplaceOrder.commissionFee = order.commissionFee;
+                marketplaceOrder.transactionFee = order.transactionFee;
+                marketplaceOrder.shippingMode = order.shippingMode;
+                marketplaceOrder.voucherAmount = order.voucherAmount;
+                marketplaceOrder.totalRealeasedAmount = order.totalRealeasedAmount;
+                marketplaceOrder.voucherCode = order.voucherCode;
+                marketplaceOrder.shippingRebate = order.shippingRebate;
                 const existingMarketplaceOrder = await tx.getRepository(entities_1.MarketplaceOrder).findOne({
                     where: { domain: marketplaceStore.domain, name: order.name },
                     relations: [
@@ -81,43 +93,59 @@ exports.syncMarketplaceOrder = {
                         otherInfoJSON.shippingProvider = deliveryProvider;
                     }
                     marketplaceOrder = Object.assign(Object.assign(Object.assign({}, existingMarketplaceOrder), marketplaceOrder), { otherInfoJSON: otherInfoJSON ? JSON.stringify(otherInfoJSON) : null, updater: user });
-                    if (cancelStatuses.includes(marketplaceOrder.status) && (marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.releaseOrderId)) {
-                        if (existingMarketplaceOrder.isSplitted) {
-                            const fulfillmentCenter = marketplaceOrder.fulfillmentCenter;
-                            const centerId = fulfillmentCenter.centerId;
-                            const warehouseDomain = await tx.getRepository(shell_1.Domain).findOne({ where: { subdomain: centerId } });
-                            const customerBizplaces = await (0, biz_base_1.getCustomerBizplaces)(warehouseDomain);
-                            const customerBizplaceId = customerBizplaces[0].id;
-                            let { items: releaseOrders } = await integration_fulfillment_1.FulfillmentAPI.getOutboundOrders(fulfillmentCenter, {
-                                customerBizplaceId,
-                                refNo: marketplaceOrder.orderNo
-                            });
-                            releaseOrders = releaseOrders.filter(function (order) {
-                                return !disallowCancelStatuses.includes(order.status);
-                            });
-                            if (releaseOrders === null || releaseOrders === void 0 ? void 0 : releaseOrders.length) {
-                                for (var a = 0; a < releaseOrders.length; a++) {
-                                    const releaseOrderId = releaseOrders[a].id;
-                                    await integration_fulfillment_1.FulfillmentAPI.cancelReleaseOrder(fulfillmentCenter, { customerBizplaceId, releaseOrderId });
+                    if (marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.releaseOrderId) {
+                        const fulfillmentCenter = marketplaceOrder.fulfillmentCenter;
+                        const centerId = fulfillmentCenter.centerId;
+                        const warehouseDomain = await tx.getRepository(shell_1.Domain).findOne({ where: { subdomain: centerId } });
+                        const customerBizplaces = await (0, biz_base_1.getCustomerBizplaces)(warehouseDomain);
+                        const customerBizplaceId = customerBizplaces[0].id;
+                        let { items: releaseOrders } = await integration_fulfillment_1.FulfillmentAPI.getOutboundOrders(fulfillmentCenter, {
+                            customerBizplaceId,
+                            refNo: marketplaceOrder.orderNo
+                        });
+                        let releaseOrder = Object.assign({}, releaseOrders[0]);
+                        let patch = {
+                            id: releaseOrder.id,
+                            marketplaceOrderStatus: marketplaceOrder.status,
+                            trackingNo: marketplaceOrder.trackingNo,
+                            transporter: dropPickProvider ? dropPickProvider : marketplaceOrder.shippingProvider
+                        };
+                        await integration_fulfillment_1.FulfillmentAPI.updateReleaseGoodDetails(fulfillmentCenter, {
+                            customerBizplaceId,
+                            releaseOrder: Object.assign({}, patch),
+                            shippingOrder: null
+                        });
+                        if (cancelStatuses.includes(marketplaceOrder.status)) {
+                            if (existingMarketplaceOrder.isSplitted) {
+                                releaseOrders = releaseOrders.filter(function (order) {
+                                    return !disallowCancelStatuses.includes(order.status);
+                                });
+                                if (releaseOrders === null || releaseOrders === void 0 ? void 0 : releaseOrders.length) {
+                                    for (var a = 0; a < releaseOrders.length; a++) {
+                                        const releaseOrderId = releaseOrders[a].id;
+                                        await integration_fulfillment_1.FulfillmentAPI.cancelReleaseOrder(fulfillmentCenter, { customerBizplaceId, releaseOrderId });
+                                    }
                                 }
                             }
-                        }
-                        else {
-                            const fulfillmentCenter = marketplaceOrder.fulfillmentCenter;
-                            const centerId = fulfillmentCenter.centerId;
-                            const warehouseDomain = await tx.getRepository(shell_1.Domain).findOne({ where: { subdomain: centerId } });
-                            const customerBizplaces = await (0, biz_base_1.getCustomerBizplaces)(warehouseDomain);
-                            const customerBizplaceId = customerBizplaces[0].id;
-                            const { items: releaseOrders } = await integration_fulfillment_1.FulfillmentAPI.getOutboundOrders(fulfillmentCenter, {
-                                customerBizplaceId,
-                                refNo: marketplaceOrder.orderNo
-                            });
-                            const releaseOrderStatus = releaseOrders[0].status;
-                            if (!disallowCancelStatuses.includes(releaseOrderStatus)) {
-                                await integration_fulfillment_1.FulfillmentAPI.cancelReleaseOrder(fulfillmentCenter, {
+                            else {
+                                const fulfillmentCenter = marketplaceOrder.fulfillmentCenter;
+                                const centerId = fulfillmentCenter.centerId;
+                                const warehouseDomain = await tx
+                                    .getRepository(shell_1.Domain)
+                                    .findOne({ where: { subdomain: centerId } });
+                                const customerBizplaces = await (0, biz_base_1.getCustomerBizplaces)(warehouseDomain);
+                                const customerBizplaceId = customerBizplaces[0].id;
+                                const { items: releaseOrders } = await integration_fulfillment_1.FulfillmentAPI.getOutboundOrders(fulfillmentCenter, {
                                     customerBizplaceId,
-                                    releaseOrderId: releaseOrders[0].id
+                                    refNo: marketplaceOrder.orderNo
                                 });
+                                const releaseOrderStatus = releaseOrders[0].status;
+                                if (!disallowCancelStatuses.includes(releaseOrderStatus)) {
+                                    await integration_fulfillment_1.FulfillmentAPI.cancelReleaseOrder(fulfillmentCenter, {
+                                        customerBizplaceId,
+                                        releaseOrderId: releaseOrders[0].id
+                                    });
+                                }
                             }
                         }
                     }
@@ -137,11 +165,11 @@ exports.syncMarketplaceOrder = {
                     marketplaceOrderShipping.attentionTo = orderShipping.attentionTo;
                     marketplaceOrderShipping.city = orderShipping.city;
                     marketplaceOrderShipping.country = orderShipping.country;
-                    marketplaceOrderShipping.state = orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.state;
+                    marketplaceOrderShipping.state = (orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.state) || null;
                     marketplaceOrderShipping.postCode = orderShipping.postCode;
                     marketplaceOrderShipping.phone1 = orderShipping.phone1;
                     marketplaceOrderShipping.phone2 = orderShipping.phone2;
-                    marketplaceOrderShipping.trackingNo = order === null || order === void 0 ? void 0 : order.trackingNo;
+                    marketplaceOrderShipping.trackingNo = (order === null || order === void 0 ? void 0 : order.trackingNo) || null;
                     marketplaceOrderShipping.orderNoRef = marketplaceOrder.orderNo;
                     marketplaceOrderShipping.subOrderNoRef = marketplaceOrder.orderNo;
                     marketplaceOrderShipping.marketplaceStore = marketplaceStore;
@@ -159,7 +187,7 @@ exports.syncMarketplaceOrder = {
                                 where: { domain, marketplaceStore, orderNoRef: marketplaceOrder.orderNo }
                             });
                             existingOrderShippings = existingOrderShippings.map(item => {
-                                return Object.assign(Object.assign({}, item), { address1: orderShipping.address1, address2: orderShipping.address2, address3: orderShipping.address3, address4: orderShipping.address4, address5: orderShipping.address5, attentionTo: orderShipping.attentionTo, city: orderShipping.city, country: orderShipping.country, state: orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.state, postCode: orderShipping.postCode, phone1: orderShipping.phone1, phone2: orderShipping.phone2, email: orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.email, trackingNo: order.trackingNo, shippingFee: orderShipping.shippingFee, actualShippingFee: orderShipping.actualShippingFee, marketplaceShippingFeeVoucher: orderShipping.marketplaceShippingFeeVoucher, sellerShippingFeeVoucher: orderShipping.sellerShippingFeeVoucher });
+                                return Object.assign(Object.assign({}, item), { address1: orderShipping.address1, address2: orderShipping.address2, address3: orderShipping.address3, address4: orderShipping.address4, address5: orderShipping.address5, attentionTo: orderShipping.attentionTo, city: orderShipping.city, country: orderShipping.country, state: orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.state, postCode: orderShipping.postCode, phone1: orderShipping.phone1, phone2: orderShipping.phone2, email: orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.email, trackingNo: order === null || order === void 0 ? void 0 : order.trackingNo, shippingFee: orderShipping.shippingFee, actualShippingFee: orderShipping.actualShippingFee, marketplaceShippingFeeVoucher: orderShipping.marketplaceShippingFeeVoucher, sellerShippingFeeVoucher: orderShipping.sellerShippingFeeVoucher });
                             });
                             savedMarketplaceOrderShippings = await tx
                                 .getRepository(entities_1.MarketplaceOrderShipping)
@@ -169,7 +197,11 @@ exports.syncMarketplaceOrder = {
                             if (existingMarketplaceOrder === null || existingMarketplaceOrder === void 0 ? void 0 : existingMarketplaceOrder.marketplaceOrderItems) {
                                 let existingOrderShipping;
                                 existingOrderShipping = existingMarketplaceOrder.marketplaceOrderItems[0].marketplaceOrderShipping;
-                                marketplaceOrderShipping = Object.assign(Object.assign(Object.assign({}, existingOrderShipping), marketplaceOrderShipping), { trackingNo: (order === null || order === void 0 ? void 0 : order.trackingNo) ? order.trackingNo : existingOrderShipping.trackingNo, updater: user });
+                                marketplaceOrderShipping = Object.assign(Object.assign(Object.assign({}, existingOrderShipping), marketplaceOrderShipping), { trackingNo: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.trackingNo)
+                                        ? marketplaceOrderShipping.trackingNo
+                                        : (existingOrderShipping === null || existingOrderShipping === void 0 ? void 0 : existingOrderShipping.trackingNo)
+                                            ? existingOrderShipping.trackingNo
+                                            : marketplaceOrderShipping.trackingNo, updater: user });
                                 savedMarketplaceOrderShipping = await tx
                                     .getRepository(entities_1.MarketplaceOrderShipping)
                                     .save(marketplaceOrderShipping);
@@ -215,9 +247,23 @@ exports.syncMarketplaceOrder = {
                     marketplaceOrderItem.discount = item.discount;
                     marketplaceOrderItem.promotionId = item.promotionId;
                     marketplaceOrderItem.creator = user;
-                    if (marketplaceStore.platform === 'lazada' && item.paymentFee) {
-                        marketplaceOrderItem.paymentFee = item.paymentFee;
-                    }
+                    marketplaceOrderItem.paymentFee = item.paymentFee || null;
+                    marketplaceOrderItem.commissionFee = item.commissionFee || null;
+                    marketplaceOrderItem.shippingFeePaidByCustomer = item.shippingFeePaidByCustomer || null;
+                    marketplaceOrderItem.itemPriceCredit = item.itemPriceCredit || null;
+                    marketplaceOrderItem.promotionalCharges = item.promotionalCharges || null;
+                    marketplaceOrderItem.ordersMarketplaceFeesTotal = item.ordersMarketplaceFeesTotal || null;
+                    marketplaceOrderItem.ordersSalesTotal = item.ordersSalesTotal || null;
+                    marketplaceOrderItem.ordersMarketingFeesTotal = item.ordersMarketingFeesTotal || null;
+                    marketplaceOrderItem.ordersLogisticsTotal = item.ordersLogisticsTotal || null;
+                    marketplaceOrderItem.marketplaceBonus = item.marketplaceBonus;
+                    marketplaceOrderItem.marketplaceBonusSeller = item.marketplaceBonusSeller;
+                    marketplaceOrderItem.shippingFeeDiscountMarketplace = item.shippingFeeDiscountMarketplace;
+                    marketplaceOrderItem.shippingFeeDiscountSeller = item.shippingFeeDiscountSeller;
+                    marketplaceOrderItem.promotionalChargesFlexiCombo = item.promotionalChargesFlexiCombo;
+                    marketplaceOrderItem.autoShippingSubsidyMarketplace = item.autoShippingSubsidyMarketplace;
+                    marketplaceOrderItem.originalShippingFee = item.originalShippingFee;
+                    marketplaceOrderItem.taxAmount = item.taxAmount;
                     marketplaceOrderItems.push(Object.assign({}, marketplaceOrderItem));
                     if (foundVariation === null || foundVariation === void 0 ? void 0 : foundVariation.primaryUnitValue)
                         orderTotalWeight += parseFloat(foundVariation.primaryUnitValue.toFixed(3)) * item.qty || 0;
@@ -226,8 +272,7 @@ exports.syncMarketplaceOrder = {
                     if (existingMarketplaceOrder.isSplitted) {
                         let existingOrderItems = [];
                         existingOrderItems = existingMarketplaceOrder.marketplaceOrderItems;
-                        marketplaceOrderItems = existingOrderItems.filter(itm => itm.name == item.name &&
-                            itm.marketplaceProductVariation.variationId == item.marketplaceProductVariation.variationId);
+                        marketplaceOrderItems = existingOrderItems.filter(itm => itm.name == item.name && itm.marketplaceProductVariation.variationId == item.variationId);
                         marketplaceOrderItems = marketplaceOrderItems.map(marketplaceOrderitem => {
                             return Object.assign(Object.assign({}, marketplaceOrderitem), { status: order.status, marketplaceProductVariation: foundVariation, trackingCode: order.trackingNo });
                         });
@@ -244,7 +289,7 @@ exports.syncMarketplaceOrder = {
                                     nonMatchedOrderItems.push(Object.assign({}, item));
                                 }
                             });
-                            if (nonMatchedOrderItems.length > 0 && cancelStatuses.includes(marketplaceOrder.status))
+                            if (nonMatchedOrderItems.length > 0 && !cancelStatuses.includes(marketplaceOrder.status))
                                 await tx.getRepository(entities_1.MarketplaceOrderItem).delete(nonMatchedOrderItems);
                             existingOrderItems = marketplaceOrderItems.map(item => {
                                 const matchedOrderItem = existingOrderItems.find(itm => itm.name == item.name &&

package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"sync-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/sync-marketplace-order.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"sync-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/sync-marketplace-order.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shippings.js CHANGED Viewed

@@ -1,20 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.marketplaceOrderShippingsResolver = void 0;
-const shell_1 = require("@things-factory/shell");
 const typeorm_1 = require("typeorm");
+const shell_1 = require("@things-factory/shell");
 const entities_1 = require("../../../entities");
 exports.marketplaceOrderShippingsResolver = {
     async marketplaceOrderShippings(_, params, context) {
-        const convertedParams = (0, shell_1.convertListParams)(params);
-        const [items, total] = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrderShipping).findAndCount(Object.assign(Object.assign({}, convertedParams), { relations: [
-                'domain',
-                'marketplaceOrderItems',
-                'marketplaceOrderItems.marketplaceProductVariation',
-                'marketplaceStore',
-                'creator',
-                'updater'
-            ] }));
+        let dateFilter = params.filters.filter(filter => filter.name == 'createdAt');
+        params.filters = params.filters.filter(x => x.name != 'createdAt');
+        const qb = (0, typeorm_1.getRepository)(entities_1.MarketplaceOrderShipping)
+            .createQueryBuilder('MOS')
+            .innerJoinAndSelect('MOS.marketplaceOrderItems', 'MOI')
+            .innerJoinAndSelect('MOI.marketplaceOrder', 'MO')
+            .innerJoinAndSelect('MOI.marketplaceProductVariation', 'MPV')
+            .innerJoinAndSelect('MOS.marketplaceStore', 'MS')
+            .innerJoinAndSelect('MOS.domain', 'domain')
+            .innerJoinAndSelect('MOS.creator', 'creator')
+            .leftJoinAndSelect('MOS.updater', 'updater');
+        (0, shell_1.buildQuery)(qb, params, context, false);
+        if (dateFilter) {
+            if (dateFilter[0].operator == 'between') {
+                qb.andWhere('MO.orderCreatedAt BETWEEN :begin AND :end', {
+                    begin: dateFilter[0].value[0],
+                    end: dateFilter[0].value[1]
+                });
+            }
+            else if (dateFilter[0].operator == 'gte') {
+                qb.andWhere('MO.orderCreatedAt >= :begin', { begin: dateFilter[0].value });
+            }
+            else if (dateFilter[0].operator == 'lte') {
+                qb.andWhere('MO.orderCreatedAt <= :begin', { begin: dateFilter[0].value });
+            }
+        }
+        const [items, total] = await qb.getManyAndCount();
         return { items, total };
     }
 };

package/dist-server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shippings.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"marketplace-order-shippings.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shippings.ts"],"names":[],"mappings":";;;AAAA,~~iDAAoE~~;~~AACpE~~,~~qCAAuC~~;~~AACvC~~,gDAA4D;AAE/C,QAAA,iCAAiC,GAAG;IAC/C,KAAK,CAAC,yBAAyB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACrE,~~MAAM~~,~~eAAe~~,GAAG,~~IAAA~~,~~yBAAiB~~,~~EAAC~~,MAAM,CAAC,CAAA;~~QACjD~~,MAAM,CAAC,~~KAAK~~,EAAE,~~KAAK~~,CAAC,~~GAAG~~,MAAM,IAAA,uBAAa,EAAC,mCAAwB,CAAC,CAAC,~~YAAY~~,~~iCAC5E~~,~~eAAe~~,~~KAClB~~,~~SAAS~~,EAAE;~~gBACT~~,~~QAAQ~~;~~gBACR~~,~~uBAAuB~~;~~gBACvB~~,~~mDAAmD~~;~~gBACnD~~,kBAAkB;~~gBAClB~~,SAAS;~~gBACT~~,SAAS;~~aACV~~,~~IACD~~,CAAA;~~QACF~~,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
1	+ {"version":3,"file":"marketplace-order-shippings.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shippings.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAE3D,iDAA6D;AAE7D,gDAA4D;AAE/C,QAAA,iCAAiC,GAAG;IAC/C,KAAK,CAAC,yBAAyB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACrE,IAAI,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,WAAW,CAAC,CAAA;QAE5E,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,WAAW,CAAC,CAAA;QAElE,MAAM,EAAE,GAAiD,IAAA,uBAAa,EAAC,mCAAwB,CAAC;aAC7F,kBAAkB,CAAC,KAAK,CAAC;aACzB,kBAAkB,CAAC,2BAA2B,EAAE,KAAK,CAAC;aACtD,kBAAkB,CAAC,sBAAsB,EAAE,IAAI,CAAC;aAChD,kBAAkB,CAAC,iCAAiC,EAAE,KAAK,CAAC;aAC5D,kBAAkB,CAAC,sBAAsB,EAAE,IAAI,CAAC;aAChD,kBAAkB,CAAC,YAAY,EAAE,QAAQ,CAAC;aAC1C,kBAAkB,CAAC,aAAa,EAAE,SAAS,CAAC;aAC5C,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC,CAAA;QAE9C,IAAA,kBAAU,EAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAA;QAEtC,IAAI,UAAU,EAAE;YACd,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,SAAS,EAAE;gBACvC,EAAE,CAAC,QAAQ,CAAC,2CAA2C,EAAE;oBACvD,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;oBAC7B,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;iBAC5B,CAAC,CAAA;aACH;iBAAM,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,KAAK,EAAE;gBAC1C,EAAE,CAAC,QAAQ,CAAC,6BAA6B,EAAE,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;aAC3E;iBAAM,IAAI,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,KAAK,EAAE;gBAC1C,EAAE,CAAC,QAAQ,CAAC,6BAA6B,EAAE,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;aAC3E;SACF;QAED,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,EAAE,CAAC,eAAe,EAAE,CAAA;QAEjD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/marketplace-order-shipping/update-marketplace-order-shipping.js CHANGED Viewed

@@ -9,7 +9,14 @@ exports.updateMarketplaceOrderShipping = {
             where: { marketplaceStore, subOrderNoRef: orderNo },
             relations: ['marketplaceStore']
         });
+        if (!marketplaceOrderShipping)
+            throw new Error(`Shipping not exist`);
         marketplaceOrderShipping.ownTrackingNo = patch.trackingNo;
+        if (marketplaceOrderShipping.marketplaceStore.platform == 'lazada') {
+            if (patch === null || patch === void 0 ? void 0 : patch.trackingNo) {
+                patch.trackingNo = marketplaceOrderShipping.trackingNo;
+            }
+        }
         marketplaceOrderShipping = await tx.getRepository(entities_1.MarketplaceOrderShipping).save(Object.assign(Object.assign(Object.assign({}, marketplaceOrderShipping), patch), { updater: user }));
         return Object.assign(Object.assign({}, marketplaceOrderShipping), { shippingId: marketplaceOrderShipping.name });
     }

package/dist-server/graphql/resolvers/marketplace-order-shipping/update-marketplace-order-shipping.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"update-marketplace-order-shipping.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order-shipping/update-marketplace-order-shipping.ts"],"names":[],"mappings":";;;AAAA,gDAA8F;AAEjF,QAAA,8BAA8B,GAAG;IAC5C,KAAK,CAAC,8BAA8B,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,OAAY;QAC3E,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QACpD,IAAI,wBAAwB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,mCAA8B,CAAC,CAAC,OAAO,CAAC;YAC5F,KAAK,EAAE,EAAE,gBAAgB,EAAE,aAAa,EAAE,OAAO,EAAE;YACnD,SAAS,EAAE,CAAC,kBAAkB,CAAC;SAChC,CAAC,CAAA;QAEF,wBAAwB,CAAC,aAAa,GAAG,KAAK,CAAC,UAAU,CAAA;QAEzD,wBAAwB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,mCAA8B,CAAC,CAAC,IAAI,+CACjF,wBAAwB,GACxB,KAAK,KACR,OAAO,EAAE,IAAI,IACb,CAAA;QAEF,uCACK,wBAAwB,KAC3B,UAAU,EAAE,wBAAwB,CAAC,IAAI,IAC1C;IACH,CAAC;CACF,CAAA"}
1	+ {"version":3,"file":"update-marketplace-order-shipping.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order-shipping/update-marketplace-order-shipping.ts"],"names":[],"mappings":";;;AAAA,gDAA8F;AAEjF,QAAA,8BAA8B,GAAG;IAC5C,KAAK,CAAC,8BAA8B,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,OAAY;QAC3E,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QACpD,IAAI,wBAAwB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,mCAA8B,CAAC,CAAC,OAAO,CAAC;YAC5F,KAAK,EAAE,EAAE,gBAAgB,EAAE,aAAa,EAAE,OAAO,EAAE;YACnD,SAAS,EAAE,CAAC,kBAAkB,CAAC;SAChC,CAAC,CAAA;QAEF,IAAI,CAAC,wBAAwB;YAAE,MAAM,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAA;QAEpE,wBAAwB,CAAC,aAAa,GAAG,KAAK,CAAC,UAAU,CAAA;QAEzD,IAAI,wBAAwB,CAAC,gBAAgB,CAAC,QAAQ,IAAI,QAAQ,EAAE;YAClE,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,EAAE;gBACrB,KAAK,CAAC,UAAU,GAAG,wBAAwB,CAAC,UAAU,CAAA;aACvD;SACF;QAED,wBAAwB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,mCAA8B,CAAC,CAAC,IAAI,+CACjF,wBAAwB,GACxB,KAAK,KACR,OAAO,EAAE,IAAI,IACb,CAAA;QAEF,uCACK,wBAAwB,KAC3B,UAAU,EAAE,wBAAwB,CAAC,IAAI,IAC1C;IACH,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/marketplace-report/marketplace-sales-report.js CHANGED Viewed

@@ -20,6 +20,7 @@ exports.marketplaceSalesReportsResolver = {
         qb.leftJoinAndSelect('moi.domain', 'domain')
             .leftJoinAndSelect('moi.marketplaceOrderShipping', 'mos')
             .leftJoinAndSelect('moi.marketplaceOrder', 'mo')
+            .leftJoinAndSelect('mo.fulfillmentCenter', 'fc')
             .leftJoinAndSelect('mo.marketplaceStore', 'ms')
             .leftJoinAndSelect('moi.marketplaceProductVariation', 'mpv')
             .leftJoinAndSelect('mpv.marketplaceProduct', 'mp')
@@ -51,6 +52,7 @@ exports.marketplaceSalesReportsResolver = {
         const total = await qb.getCount();
         items = items.map(item => {
             return {
+                fulfilmentCenter: item.fc_name,
                 orderNo: item.mo_name,
                 orderCreatedAt: item.mo_order_created_at,
                 buyerUsername: item.mo_buyer_username,
@@ -63,9 +65,10 @@ exports.marketplaceSalesReportsResolver = {
                 promotionId: item.moi_promotion_id,
                 originalPrice: item.moi_original_price,
                 paidPrice: item.moi_paid_price,
-                sku: item.mpv_name,
+                sku: item.mpv_sku,
                 qty: item.moi_qty,
-                variationSku: item.mpv_variation_sku,
+                variationId: item.mpv_variation_id,
+                variationName: item.mpv_name,
                 productName: item.mp_name,
                 productSku: item.mp_isku,
                 productDiscount: item.moi_discount,
@@ -73,7 +76,34 @@ exports.marketplaceSalesReportsResolver = {
                 shippingFee: item.mos_shipping_fee,
                 actualShippingFee: item.mos_actual_shipping_fee,
                 marketplaceShippingFeeVoucher: item.mos_marketplace_shipping_fee_voucher,
-                sellerShippingFeeVoucher: item.mos_seller_shipping_fee_voucher
+                sellerShippingFeeVoucher: item.mos_seller_shipping_fee_voucher,
+                voucherAmount: item.mo_voucher_amount,
+                shippingRebate: item.mo_shipping_rebate,
+                commissionFee: item.mo_commission_fee,
+                serviceFee: item.mo_service_fee,
+                transactionFee: item.mo_transaction_fee,
+                totalRealeasedAmount: item.mo_total_realeased_amount,
+                voucherCode: item.mo_voucher_code,
+                shippingMode: item.mo_shipping_mode,
+                status: item.mo_status,
+                shippingFeePaidByCustomer: item.moi_shipping_fee_paid_by_customer,
+                promotionalCharges: item.moi_promotional_charges,
+                ordersMarketplaceFeesTotal: item.moi_orders_marketplace_fees_total,
+                ordersMarketingFeesTotal: item.moi_orders_marketing_fees_total,
+                ordersSalesTotal: item.moi_orders_sales_total,
+                ordersLogisticsTotal: item.moi_orders_logistics_total,
+                itemPriceCredit: item.moi_item_price_credit,
+                marketplaceBonus: item.moi_marketplace_bonus + item.moi_marketplace_bonus_seller,
+                marketplaceBonusSeller: item.moi_marketplace_bonus_seller,
+                shippingFeeDiscountMarketplace: item.moi_shipping_fee_discount_marketplace,
+                shippingFeeDiscountSeller: item.moi_shipping_fee_discount_seller,
+                promotionalChargesFlexiCombo: item.moi_promotional_charges_flexi_combo,
+                autoShippingSubsidyMarketplace: item.moi_auto_shipping_subsidy_marketplace,
+                grandTotal: item.moi_orders_marketplace_fees_total + item.moi_orders_marketing_fees_total + item.moi_orders_sales_total + item.moi_orders_logistics_total,
+                originalShippingFee: item.moi_original_shipping_fee,
+                taxAmount: item.moi_tax_amount,
+                itemCommissionFee: item.moi_commission_fee,
+                variationSku: item.mpv_variation_sku
             };
         });
         return { items, total };

package/dist-server/graphql/resolvers/marketplace-report/marketplace-sales-report.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"marketplace-sales-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-report/marketplace-sales-report.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAE3D,iDAA6D;AAE7D,gDAAwD;AAE3C,QAAA,+BAA+B,GAAG;IAC7C,KAAK,CAAC,uBAAuB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACnE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,CAAC,UAAU,CAAA;QAEzC,IAAI,sBAAsB,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,kBAAkB,CAAC,CAAA;QAC3F,IAAI,aAAa,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,CAAA;QAEzE,IAAI,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QAC9E,IAAI,sBAAsB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,oBAAoB,CAAC,CAAA;QAChG,IAAI,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;QAC9E,IAAI,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;QAE1E,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAC1G,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CACpC,MAAM,CAAC,EAAE,CAAC,CAAC,UAAU,EAAE,oBAAoB,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAC9F,CAAA;QAED,IAAI,EAAE,GAA6C,IAAA,uBAAa,EAAC,+BAAoB,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAA;QAChH,IAAA,kBAAU,EAAC,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAA;QAC/B,EAAE,CAAC,iBAAiB,CAAC,YAAY,EAAE,QAAQ,CAAC;aACzC,iBAAiB,CAAC,8BAA8B,EAAE,KAAK,CAAC;aACxD,iBAAiB,CAAC,sBAAsB,EAAE,IAAI,CAAC;aAC/C,iBAAiB,CAAC,qBAAqB,EAAE,IAAI,CAAC;aAC9C,iBAAiB,CAAC,iCAAiC,EAAE,KAAK,CAAC;aAC3D,iBAAiB,CAAC,wBAAwB,EAAE,IAAI,CAAC;aACjD,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC;aAC3C,iBAAiB,CAAC,aAAa,EAAE,SAAS,CAAC;aAC3C,iBAAiB,CAChB,2BAA2B,EAC3B,KAAK,EACL,kEAAkE,CACnE,CAAA;QAEH,IAAI,sBAAsB,EAAE;YAC1B,EAAE,CAAC,UAAU,CAAC,SAAS,EAAE,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;SACvE;QAED,IAAI,aAAa,EAAE;YACjB,EAAE,CAAC,UAAU,CAAC,SAAS,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;SAC9D;QAED,IAAI,cAAc,EAAE;YAClB,EAAE,CAAC,QAAQ,CAAC,yBAAyB,EAAE,EAAE,QAAQ,EAAE,cAAc,CAAC,KAAK,EAAE,CAAC,CAAA;SAC3E;QAED,IAAI,sBAAsB,EAAE;YAC1B,EAAE,CAAC,QAAQ,CAAC,2BAA2B,EAAE,EAAE,gBAAgB,EAAE,sBAAsB,CAAC,KAAK,EAAE,CAAC,CAAA;SAC7F;QAED,IAAI,cAAc,IAAI,YAAY,EAAE;YAClC,EAAE,CAAC,QAAQ,CAAC,mDAAmD,EAAE;gBAC/D,QAAQ,EAAE,cAAc,CAAC,KAAK;gBAC9B,MAAM,EAAE,YAAY,CAAC,KAAK;aAC3B,CAAC,CAAA;SACH;QAED,IAAI,KAAK,GAAG,MAAM,EAAE;aACjB,MAAM,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;aAC1B,KAAK,CAAC,KAAK,CAAC;aACZ,UAAU,EAAE,CAAA;QAEf,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAA;QAEjC,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YACvB,OAAO;gBACL,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,cAAc,EAAE,IAAI,CAAC,mBAAmB;gBACxC,aAAa,EAAE,IAAI,CAAC,iBAAiB;gBACrC,OAAO,EAAE,IAAI,CAAC,WAAW;gBACzB,WAAW,EAAE,IAAI,CAAC,eAAe;gBACjC,YAAY,EAAE,IAAI,CAAC,UAAU;gBAC7B,gBAAgB,EAAE,IAAI,CAAC,oBAAoB;gBAC3C,SAAS,EAAE,IAAI,CAAC,OAAO;gBACvB,gBAAgB,EAAE,IAAI,CAAC,cAAc;gBACrC,WAAW,EAAE,IAAI,CAAC,gBAAgB;gBAClC,aAAa,EAAE,IAAI,CAAC,kBAAkB;gBACtC,SAAS,EAAE,IAAI,CAAC,cAAc;gBAC9B,GAAG,EAAE,IAAI,CAAC,~~QAAQ~~;~~gBAClB~~,GAAG,EAAE,IAAI,CAAC,OAAO;gBACjB,~~YAAY~~,EAAE,IAAI,CAAC,~~iBAAiB~~;~~gBACpC~~,WAAW,EAAE,IAAI,CAAC,OAAO;gBACzB,UAAU,EAAE,IAAI,CAAC,OAAO;gBACxB,eAAe,EAAE,IAAI,CAAC,YAAY;gBAClC,UAAU,EAAE,IAAI,CAAC,eAAe;gBAChC,WAAW,EAAE,IAAI,CAAC,gBAAgB;gBAClC,iBAAiB,EAAE,IAAI,CAAC,uBAAuB;gBAC/C,6BAA6B,EAAE,IAAI,CAAC,oCAAoC;gBACxE,wBAAwB,EAAE,IAAI,CAAC,+BAA+B;~~aAC~~/D,CAAA;QACH,CAAC,CAAC,CAAA;QAEF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA"}
1	+ {"version":3,"file":"marketplace-sales-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-report/marketplace-sales-report.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/types/marketplace-report/marketplace-sales-report.js CHANGED Viewed

@@ -7,6 +7,16 @@ exports.MarketplaceSalesReport = void 0;
 const graphql_tag_1 = __importDefault(require("graphql-tag"));
 exports.MarketplaceSalesReport = (0, graphql_tag_1.default) `
   type MarketplaceSalesReport {
+    fulfilmentCenter: String
+    voucherAmount: Float
+    shippingRebate: Float
+    commissionFee: Float
+    serviceFee: Float
+    transactionFee: String
+    totalRealeasedAmount: Float
+    voucherCode: String
+    shippingMode: String
+    status: String
     orderNo: String
     orderCreatedAt: String
     buyerUsername: String
@@ -21,7 +31,8 @@ exports.MarketplaceSalesReport = (0, graphql_tag_1.default) `
     paidPrice: Float
     sku: String
     qty: Int
-    variationSku: String
+    variationId: String
+    variationName: String
     productName: String
     productSku: String
     productDiscount: Float
@@ -30,6 +41,25 @@ exports.MarketplaceSalesReport = (0, graphql_tag_1.default) `
     actualShippingFee: Float
     marketplaceShippingFeeVoucher: Float
     sellerShippingFeeVoucher: Float
+    shippingFeePaidByCustomer: Float
+    promotionalCharges: Float
+    ordersMarketplaceFeesTotal: Float
+    ordersMarketingFeesTotal: Float
+    ordersSalesTotal: Float
+    ordersLogisticsTotal: Float
+    itemPriceCredit: Float
+    marketplaceBonus: Float
+    marketplaceBonusSeller: Float
+    shippingFeeDiscountMarketplace: Float
+    shippingFeeDiscountSeller: Float
+    promotionalChargesFlexiCombo: Float
+    autoShippingSubsidyMarketplace: Float
+    grandTotal: Float
+    originalShippingFee: Float
+    taxAmount: Float
+    fulfillmentCenter: String
+    variationSku: String
+    itemCommissionFee: Float
   }
 `;
 //# sourceMappingURL=marketplace-sales-report.js.map

package/dist-server/graphql/types/marketplace-report/marketplace-sales-report.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"marketplace-sales-report.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-report/marketplace-sales-report.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,sBAAsB,GAAG,IAAA,qBAAG,EAAA~~;;;;;;;;;;;;;;;;;;;;;;;;;;CA0BxC~~,CAAA"}
1	+ {"version":3,"file":"marketplace-sales-report.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-report/marketplace-sales-report.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,sBAAsB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwDxC,CAAA"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/marketplace-base",
-  "version": "3.7.10",
+  "version": "3.8.3",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,9 +24,9 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/integration-fulfillment": "^3.7.7",
-    "@things-factory/integration-marketplace": "^3.7.9",
-    "@things-factory/shell": "^3.7.5"
+    "@things-factory/integration-fulfillment": "^3.8.3",
+    "@things-factory/integration-marketplace": "^3.8.3",
+    "@things-factory/shell": "^3.8.0"
   },
-  "gitHead": "dc4aa344ee524651b4e633c3647c85c8daad8eb6"
+  "gitHead": "b1c118ec9834b1cb4ccf9e85b70623250a8f6745"
 }

package/server/entities/marketplace-order-item.ts CHANGED Viewed

@@ -75,6 +75,54 @@ export class MarketplaceOrderItem {
   @Column({ nullable: true, type: 'float' })
   paymentFee: number
+  @Column({ nullable: true, type: 'float' })
+  commissionFee: number
+  @Column({ nullable: true, type: 'float' })
+  shippingFeePaidByCustomer: number
+  @Column({ nullable: true, type: 'float' })
+  promotionalCharges: number
+  @Column({ nullable: true, type: 'float' })
+  ordersMarketplaceFeesTotal: number
+  @Column({ nullable: true, type: 'float' })
+  ordersMarketingFeesTotal: number
+  @Column({ nullable: true, type: 'float' })
+  ordersSalesTotal: number
+  @Column({ nullable: true, type: 'float' })
+  ordersLogisticsTotal: number
+  @Column({ nullable: true, type: 'float' })
+  itemPriceCredit: number
+  @Column({ nullable: true, type: 'float' })
+  marketplaceBonus: number
+  @Column({ nullable: true, type: 'float' })
+  marketplaceBonusSeller: number
+  @Column({ nullable: true, type: 'float' })
+  shippingFeeDiscountMarketplace: number
+  @Column({ nullable: true, type: 'float' })
+  shippingFeeDiscountSeller: number
+  @Column({ nullable: true, type: 'float' })
+  promotionalChargesFlexiCombo: number
+  @Column({ nullable: true, type: 'float' })
+  autoShippingSubsidyMarketplace: number
+  @Column({ nullable: true, type: 'float' })
+  originalShippingFee: number
+  @Column({ nullable: true, type: 'float' })
+  taxAmount: number
   @CreateDateColumn()
   createdAt: Date

package/server/entities/marketplace-order.ts CHANGED Viewed

@@ -110,6 +110,27 @@ export class MarketplaceOrder {
   @Column({ nullable: true })
   payTime: Date
+  @Column({ nullable: true, type: 'float' })
+  commissionFee: Number
+  @Column({ nullable: true, type: 'float' })
+  serviceFee: Number
+  @Column({ nullable: true, type: 'float' })
+  transactionFee: Number
+  @Column({ nullable: true, type: 'float' })
+  totalRealeasedAmount: Number
+  @Column({ nullable: true, type: 'float' })
+  voucherAmount: String
+  @Column({ nullable: true, type: 'float' })
+  shippingRebate: Number
+  @Column({ nullable: true })
+  shippingMode: String
   @CreateDateColumn()
   createdAt: Date