@things-factory/marketplace-base 4.0.7 → 4.0.12

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 (85) hide show
  1. package/dist-server/entities/index.js +8 -2
  2. package/dist-server/entities/index.js.map +1 -1
  3. package/dist-server/entities/marketplace-order-item.js +80 -0
  4. package/dist-server/entities/marketplace-order-item.js.map +1 -1
  5. package/dist-server/entities/marketplace-order-shipping.js +16 -0
  6. package/dist-server/entities/marketplace-order-shipping.js.map +1 -1
  7. package/dist-server/entities/marketplace-order.js +36 -0
  8. package/dist-server/entities/marketplace-order.js.map +1 -1
  9. package/dist-server/entities/marketplace-refund-order-item.js +82 -0
  10. package/dist-server/entities/marketplace-refund-order-item.js.map +1 -0
  11. package/dist-server/entities/marketplace-refund-order.js +77 -0
  12. package/dist-server/entities/marketplace-refund-order.js.map +1 -0
  13. package/dist-server/graphql/resolvers/index.js +2 -0
  14. package/dist-server/graphql/resolvers/index.js.map +1 -1
  15. package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js +19 -17
  16. package/dist-server/graphql/resolvers/marketplace-order/marketplace-orders.js.map +1 -1
  17. package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js +267 -205
  18. package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js.map +1 -1
  19. package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js +100 -43
  20. package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js.map +1 -1
  21. package/dist-server/graphql/resolvers/marketplace-order-item/marketplace-order-items.js +1 -1
  22. package/dist-server/graphql/resolvers/marketplace-order-item/marketplace-order-items.js.map +1 -1
  23. package/dist-server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shippings.js +28 -10
  24. package/dist-server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shippings.js.map +1 -1
  25. package/dist-server/graphql/resolvers/marketplace-order-shipping/update-marketplace-order-shipping.js +7 -0
  26. package/dist-server/graphql/resolvers/marketplace-order-shipping/update-marketplace-order-shipping.js.map +1 -1
  27. package/dist-server/graphql/resolvers/marketplace-refund-order/index.js +9 -0
  28. package/dist-server/graphql/resolvers/marketplace-refund-order/index.js.map +1 -0
  29. package/dist-server/graphql/resolvers/marketplace-refund-order/sync-all-marketplace-refund-orders.js +93 -0
  30. package/dist-server/graphql/resolvers/marketplace-refund-order/sync-all-marketplace-refund-orders.js.map +1 -0
  31. package/dist-server/graphql/resolvers/marketplace-refund-order/sync-marketplace-refund-orders.js +79 -0
  32. package/dist-server/graphql/resolvers/marketplace-refund-order/sync-marketplace-refund-orders.js.map +1 -0
  33. package/dist-server/graphql/resolvers/marketplace-report/index.js +8 -0
  34. package/dist-server/graphql/resolvers/marketplace-report/index.js.map +1 -0
  35. package/dist-server/graphql/resolvers/marketplace-report/marketplace-sales-report.js +112 -0
  36. package/dist-server/graphql/resolvers/marketplace-report/marketplace-sales-report.js.map +1 -0
  37. package/dist-server/graphql/types/index.js +2 -0
  38. package/dist-server/graphql/types/index.js.map +1 -1
  39. package/dist-server/graphql/types/marketplace-order/marketplace-order.js +2 -0
  40. package/dist-server/graphql/types/marketplace-order/marketplace-order.js.map +1 -1
  41. package/dist-server/graphql/types/marketplace-order-item/marketplace-order-item.js +4 -0
  42. package/dist-server/graphql/types/marketplace-order-item/marketplace-order-item.js.map +1 -1
  43. package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.js +4 -0
  44. package/dist-server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.js.map +1 -1
  45. package/dist-server/graphql/types/marketplace-refund-order/index.js +31 -0
  46. package/dist-server/graphql/types/marketplace-refund-order/index.js.map +1 -0
  47. package/dist-server/graphql/types/marketplace-refund-order/marketplace-refund-order-list.js +14 -0
  48. package/dist-server/graphql/types/marketplace-refund-order/marketplace-refund-order-list.js.map +1 -0
  49. package/dist-server/graphql/types/marketplace-refund-order/marketplace-refund-order.js +23 -0
  50. package/dist-server/graphql/types/marketplace-refund-order/marketplace-refund-order.js.map +1 -0
  51. package/dist-server/graphql/types/marketplace-report/index.js +25 -0
  52. package/dist-server/graphql/types/marketplace-report/index.js.map +1 -0
  53. package/dist-server/graphql/types/marketplace-report/marketplace-sales-report-list.js +14 -0
  54. package/dist-server/graphql/types/marketplace-report/marketplace-sales-report-list.js.map +1 -0
  55. package/dist-server/graphql/types/marketplace-report/marketplace-sales-report.js +65 -0
  56. package/dist-server/graphql/types/marketplace-report/marketplace-sales-report.js.map +1 -0
  57. package/package.json +5 -5
  58. package/server/entities/index.ts +8 -2
  59. package/server/entities/marketplace-order-item.ts +60 -0
  60. package/server/entities/marketplace-order-shipping.ts +12 -0
  61. package/server/entities/marketplace-order.ts +27 -0
  62. package/server/entities/marketplace-refund-order-item.ts +65 -0
  63. package/server/entities/marketplace-refund-order.ts +62 -0
  64. package/server/graphql/resolvers/index.ts +2 -0
  65. package/server/graphql/resolvers/marketplace-order/marketplace-orders.ts +25 -17
  66. package/server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.ts +337 -278
  67. package/server/graphql/resolvers/marketplace-order/sync-marketplace-order.ts +107 -45
  68. package/server/graphql/resolvers/marketplace-order-item/marketplace-order-items.ts +5 -2
  69. package/server/graphql/resolvers/marketplace-order-shipping/marketplace-order-shippings.ts +35 -14
  70. package/server/graphql/resolvers/marketplace-order-shipping/update-marketplace-order-shipping.ts +8 -0
  71. package/server/graphql/resolvers/marketplace-refund-order/index.ts +9 -0
  72. package/server/graphql/resolvers/marketplace-refund-order/sync-all-marketplace-refund-orders.ts +121 -0
  73. package/server/graphql/resolvers/marketplace-refund-order/sync-marketplace-refund-orders.ts +103 -0
  74. package/server/graphql/resolvers/marketplace-report/index.ts +7 -0
  75. package/server/graphql/resolvers/marketplace-report/marketplace-sales-report.ts +130 -0
  76. package/server/graphql/types/index.ts +2 -0
  77. package/server/graphql/types/marketplace-order/marketplace-order.ts +2 -0
  78. package/server/graphql/types/marketplace-order-item/marketplace-order-item.ts +4 -0
  79. package/server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.ts +4 -0
  80. package/server/graphql/types/marketplace-refund-order/index.ts +16 -0
  81. package/server/graphql/types/marketplace-refund-order/marketplace-refund-order-list.ts +8 -0
  82. package/server/graphql/types/marketplace-refund-order/marketplace-refund-order.ts +17 -0
  83. package/server/graphql/types/marketplace-report/index.ts +10 -0
  84. package/server/graphql/types/marketplace-report/marketplace-sales-report-list.ts +8 -0
  85. package/server/graphql/types/marketplace-report/marketplace-sales-report.ts +59 -0
@@ -0,0 +1,8 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.MarketplaceReportResolver = void 0;
4
+ const marketplace_sales_report_1 = require("./marketplace-sales-report");
5
+ exports.MarketplaceReportResolver = {
6
+ Query: Object.assign({}, marketplace_sales_report_1.marketplaceSalesReportsResolver)
7
+ };
8
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-report/index.ts"],"names":[],"mappings":";;;AAAA,yEAA4E;AAE/D,QAAA,yBAAyB,GAAG;IACvC,KAAK,oBACA,0DAA+B,CACnC;CACF,CAAA"}
@@ -0,0 +1,112 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.marketplaceSalesReportsResolver = void 0;
4
+ const typeorm_1 = require("typeorm");
5
+ const shell_1 = require("@things-factory/shell");
6
+ const entities_1 = require("../../../entities");
7
+ exports.marketplaceSalesReportsResolver = {
8
+ async marketplaceSalesReports(_, params, context) {
9
+ const { page, limit } = params.pagination;
10
+ let marketplaceStoreSorter = params.sortings.find(sort => sort.name === 'marketplaceStore');
11
+ let orderNoSorter = params.sortings.find(sort => sort.name === 'orderNo');
12
+ let platformFilter = params.filters.find(filter => filter.name === 'platform');
13
+ let marketplaceStoreFilter = params.filters.find(filter => filter.name === 'marketplaceStoreId');
14
+ let fromDateFilter = params.filters.find(filter => filter.name === 'fromDate');
15
+ let toDateFilter = params.filters.find(filter => filter.name === 'toDate');
16
+ params.sortings = params.sortings.filter(sort => ['marketplaceStore', 'orderNo'].indexOf(sort.name) == -1);
17
+ params.filters = params.filters.filter(filter => ['platform', 'marketplaceStoreId', 'fromDate', 'toDate'].indexOf(filter.name) == -1);
18
+ let qb = (0, typeorm_1.getRepository)(entities_1.MarketplaceOrderItem).createQueryBuilder('moi');
19
+ (0, shell_1.buildQuery)(qb, params, context);
20
+ qb.leftJoinAndSelect('moi.domain', 'domain')
21
+ .leftJoinAndSelect('moi.marketplaceOrderShipping', 'mos')
22
+ .leftJoinAndSelect('moi.marketplaceOrder', 'mo')
23
+ .leftJoinAndSelect('mo.fulfillmentCenter', 'fc')
24
+ .leftJoinAndSelect('mo.marketplaceStore', 'ms')
25
+ .leftJoinAndSelect('moi.marketplaceProductVariation', 'mpv')
26
+ .leftJoinAndSelect('mpv.marketplaceProduct', 'mp')
27
+ .leftJoinAndSelect('moi.creator', 'creator')
28
+ .leftJoinAndSelect('moi.updater', 'updater')
29
+ .leftJoinAndSelect('marketplace_refund_orders', 'mro', 'mo.name = mro.original_order_no AND mo.domain_id = mro.domain_id');
30
+ if (marketplaceStoreSorter) {
31
+ qb.addOrderBy('ms.name', marketplaceStoreSorter.desc ? 'DESC' : 'ASC');
32
+ }
33
+ if (orderNoSorter) {
34
+ qb.addOrderBy('mo.name', orderNoSorter.desc ? 'DESC' : 'ASC');
35
+ }
36
+ if (platformFilter) {
37
+ qb.andWhere('ms.platform = :platform', { platform: platformFilter.value });
38
+ }
39
+ if (marketplaceStoreFilter) {
40
+ qb.andWhere('ms.id = :marketplaceStore', { marketplaceStore: marketplaceStoreFilter.value });
41
+ }
42
+ if (fromDateFilter && toDateFilter) {
43
+ qb.andWhere('mo.order_created_at BETWEEN :fromDate AND :toDate', {
44
+ fromDate: fromDateFilter.value,
45
+ toDate: toDateFilter.value
46
+ });
47
+ }
48
+ let items = await qb
49
+ .offset((page - 1) * limit)
50
+ .limit(limit)
51
+ .getRawMany();
52
+ const total = await qb.getCount();
53
+ items = items.map(item => {
54
+ return {
55
+ fulfilmentCenter: item.fc_name,
56
+ orderNo: item.mo_name,
57
+ orderCreatedAt: item.mo_order_created_at,
58
+ buyerUsername: item.mo_buyer_username,
59
+ payTime: item.mo_pay_time,
60
+ totalAmount: item.mo_total_amount,
61
+ refundAmount: item.mro_amount,
62
+ shippingProvider: item.mo_shipping_provider,
63
+ storeName: item.ms_name,
64
+ storeDescription: item.ms_description,
65
+ promotionId: item.moi_promotion_id,
66
+ originalPrice: item.moi_original_price,
67
+ paidPrice: item.moi_paid_price,
68
+ sku: item.mpv_sku,
69
+ qty: item.moi_qty,
70
+ variationId: item.mpv_variation_id,
71
+ variationName: item.mpv_name,
72
+ productName: item.mp_name,
73
+ productSku: item.mp_isku,
74
+ productDiscount: item.moi_discount,
75
+ paymentFee: item.moi_payment_fee,
76
+ shippingFee: item.mos_shipping_fee,
77
+ actualShippingFee: item.mos_actual_shipping_fee,
78
+ marketplaceShippingFeeVoucher: item.mos_marketplace_shipping_fee_voucher,
79
+ sellerShippingFeeVoucher: item.mos_seller_shipping_fee_voucher,
80
+ voucherAmount: item.mo_voucher_amount,
81
+ shippingRebate: item.mo_shipping_rebate,
82
+ commissionFee: item.mo_commission_fee,
83
+ serviceFee: item.mo_service_fee,
84
+ transactionFee: item.mo_transaction_fee,
85
+ totalRealeasedAmount: item.mo_total_realeased_amount,
86
+ voucherCode: item.mo_voucher_code,
87
+ shippingMode: item.mo_shipping_mode,
88
+ status: item.mo_status,
89
+ shippingFeePaidByCustomer: item.moi_shipping_fee_paid_by_customer,
90
+ promotionalCharges: item.moi_promotional_charges,
91
+ ordersMarketplaceFeesTotal: item.moi_orders_marketplace_fees_total,
92
+ ordersMarketingFeesTotal: item.moi_orders_marketing_fees_total,
93
+ ordersSalesTotal: item.moi_orders_sales_total,
94
+ ordersLogisticsTotal: item.moi_orders_logistics_total,
95
+ itemPriceCredit: item.moi_item_price_credit,
96
+ marketplaceBonus: item.moi_marketplace_bonus + item.moi_marketplace_bonus_seller,
97
+ marketplaceBonusSeller: item.moi_marketplace_bonus_seller,
98
+ shippingFeeDiscountMarketplace: item.moi_shipping_fee_discount_marketplace,
99
+ shippingFeeDiscountSeller: item.moi_shipping_fee_discount_seller,
100
+ promotionalChargesFlexiCombo: item.moi_promotional_charges_flexi_combo,
101
+ autoShippingSubsidyMarketplace: item.moi_auto_shipping_subsidy_marketplace,
102
+ grandTotal: item.moi_orders_marketplace_fees_total + item.moi_orders_marketing_fees_total + item.moi_orders_sales_total + item.moi_orders_logistics_total,
103
+ originalShippingFee: item.moi_original_shipping_fee,
104
+ taxAmount: item.moi_tax_amount,
105
+ itemCommissionFee: item.moi_commission_fee,
106
+ variationSku: item.mpv_variation_sku
107
+ };
108
+ });
109
+ return { items, total };
110
+ }
111
+ };
112
+ //# sourceMappingURL=marketplace-sales-report.js.map
@@ -0,0 +1 @@
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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"}
@@ -20,4 +20,6 @@ __exportStar(require("./marketplace-product-variation"), exports);
20
20
  __exportStar(require("./store-replenishment"), exports);
21
21
  __exportStar(require("./store-replenishment-item"), exports);
22
22
  __exportStar(require("./marketplace-product-variation-price"), exports);
23
+ __exportStar(require("./marketplace-refund-order"), exports);
24
+ __exportStar(require("./marketplace-report"), exports);
23
25
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sDAAmC;AACnC,2DAAwC;AACxC,+DAA4C;AAC5C,wDAAqC;AACrC,kEAA+C;AAC/C,iEAA8C;AAC9C,kEAA+C;AAC/C,wDAAqC;AACrC,6DAA0C;AAC1C,wEAAqD"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../server/graphql/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sDAAmC;AACnC,2DAAwC;AACxC,+DAA4C;AAC5C,wDAAqC;AACrC,kEAA+C;AAC/C,iEAA8C;AAC9C,kEAA+C;AAC/C,wDAAqC;AACrC,6DAA0C;AAC1C,wEAAqD;AACrD,6DAA0C;AAC1C,uDAAoC"}
@@ -32,6 +32,8 @@ exports.MarketplaceOrder = (0, graphql_tag_1.default) `
32
32
  releaseOrderId: String
33
33
  otherInfoJSON: String
34
34
  isSplitted: Boolean
35
+ buyerUsername: String
36
+ payTime: String
35
37
  updater: User
36
38
  creator: User
37
39
  orderUpdatedAt: String
@@ -1 +1 @@
1
- {"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order/marketplace-order.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,gBAAgB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmClC,CAAA"}
1
+ {"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order/marketplace-order.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,gBAAgB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqClC,CAAA"}
@@ -25,6 +25,10 @@ exports.MarketplaceOrderItem = (0, graphql_tag_1.default) `
25
25
  reason: String
26
26
  status: String
27
27
  description: String
28
+ originalPrice: Float
29
+ discount: Float
30
+ promotionId: String
31
+ paymentFee: Float
28
32
  updater: User
29
33
  creator: User
30
34
  updatedAt: String
@@ -1 +1 @@
1
- {"version":3,"file":"marketplace-order-item.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-item/marketplace-order-item.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,oBAAoB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;CAyBtC,CAAA"}
1
+ {"version":3,"file":"marketplace-order-item.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-item/marketplace-order-item.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,oBAAoB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6BtC,CAAA"}
@@ -49,6 +49,10 @@ exports.MarketplaceOrderShipping = (0, graphql_tag_1.default) `
49
49
  parcelType: Int
50
50
  goodsType: Int
51
51
  deliveryMethod: Int
52
+ shippingFee: Float
53
+ actualShippingFee: Float
54
+ marketplaceShippingFeeVoucher: Float
55
+ sellerShippingFeeVoucher: Float
52
56
  updater: User
53
57
  creator: User
54
58
  updatedAt: String
@@ -1 +1 @@
1
- {"version":3,"file":"marketplace-order-shipping.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,wBAAwB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiD1C,CAAA"}
1
+ {"version":3,"file":"marketplace-order-shipping.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-order-shipping/marketplace-order-shipping.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,wBAAwB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqD1C,CAAA"}
@@ -0,0 +1,31 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
5
+ }) : (function(o, m, k, k2) {
6
+ if (k2 === undefined) k2 = k;
7
+ o[k2] = m[k];
8
+ }));
9
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
10
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
11
+ };
12
+ var __importDefault = (this && this.__importDefault) || function (mod) {
13
+ return (mod && mod.__esModule) ? mod : { "default": mod };
14
+ };
15
+ Object.defineProperty(exports, "__esModule", { value: true });
16
+ exports.MarketplaceRefundOrderResolver = void 0;
17
+ const graphql_tag_1 = __importDefault(require("graphql-tag"));
18
+ __exportStar(require("./marketplace-refund-order"), exports);
19
+ __exportStar(require("./marketplace-refund-order-list"), exports);
20
+ exports.MarketplaceRefundOrderResolver = (0, graphql_tag_1.default) `
21
+ extend type Mutation {
22
+ syncMarketplaceRefundOrders(storeId: String!, fromDate: String, toDate: String): Boolean @transaction
23
+ syncAllMarketplaceRefundOrders(
24
+ companyDomainId: String
25
+ fromDate: String
26
+ toDate: String
27
+ blackListStores: [String]
28
+ ): Boolean
29
+ }
30
+ `;
31
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-refund-order/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA6B;AAE7B,6DAA0C;AAC1C,kEAA+C;AAElC,QAAA,8BAA8B,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;CAUhD,CAAA"}
@@ -0,0 +1,14 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.MarketplaceRefundOrderList = void 0;
7
+ const graphql_tag_1 = __importDefault(require("graphql-tag"));
8
+ exports.MarketplaceRefundOrderList = (0, graphql_tag_1.default) `
9
+ type MarketplaceRefundOrderList {
10
+ items: [MarketplaceRefundOrder]
11
+ total: Int
12
+ }
13
+ `;
14
+ //# sourceMappingURL=marketplace-refund-order-list.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"marketplace-refund-order-list.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-refund-order/marketplace-refund-order-list.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,0BAA0B,GAAG,IAAA,qBAAG,EAAA;;;;;CAK5C,CAAA"}
@@ -0,0 +1,23 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.MarketplaceRefundOrder = void 0;
7
+ const graphql_tag_1 = __importDefault(require("graphql-tag"));
8
+ exports.MarketplaceRefundOrder = (0, graphql_tag_1.default) `
9
+ type MarketplaceRefundOrder {
10
+ id: String
11
+ name: String
12
+ domain: Domain
13
+ originalOrderNo: String
14
+ orderNo: String
15
+ amount: Int
16
+ status: String
17
+ updater: User
18
+ creator: User
19
+ updatedAt: String
20
+ createdAt: String
21
+ }
22
+ `;
23
+ //# sourceMappingURL=marketplace-refund-order.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"marketplace-refund-order.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-refund-order/marketplace-refund-order.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,sBAAsB,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;CAcxC,CAAA"}
@@ -0,0 +1,25 @@
1
+ "use strict";
2
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
3
+ if (k2 === undefined) k2 = k;
4
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
5
+ }) : (function(o, m, k, k2) {
6
+ if (k2 === undefined) k2 = k;
7
+ o[k2] = m[k];
8
+ }));
9
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
10
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
11
+ };
12
+ var __importDefault = (this && this.__importDefault) || function (mod) {
13
+ return (mod && mod.__esModule) ? mod : { "default": mod };
14
+ };
15
+ Object.defineProperty(exports, "__esModule", { value: true });
16
+ exports.MarketplaceReportResolver = void 0;
17
+ const graphql_tag_1 = __importDefault(require("graphql-tag"));
18
+ __exportStar(require("./marketplace-sales-report"), exports);
19
+ __exportStar(require("./marketplace-sales-report-list"), exports);
20
+ exports.MarketplaceReportResolver = (0, graphql_tag_1.default) `
21
+ extend type Query {
22
+ marketplaceSalesReports(filters: [Filter], pagination: Pagination, sortings: [Sorting]): MarketplaceSalesReportList
23
+ }
24
+ `;
25
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-report/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,8DAA6B;AAE7B,6DAA0C;AAC1C,kEAA+C;AAElC,QAAA,yBAAyB,GAAG,IAAA,qBAAG,EAAA;;;;CAI3C,CAAA"}
@@ -0,0 +1,14 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.MarketplaceSalesReportList = void 0;
7
+ const graphql_tag_1 = __importDefault(require("graphql-tag"));
8
+ exports.MarketplaceSalesReportList = (0, graphql_tag_1.default) `
9
+ type MarketplaceSalesReportList {
10
+ items: [MarketplaceSalesReport]
11
+ total: Int
12
+ }
13
+ `;
14
+ //# sourceMappingURL=marketplace-sales-report-list.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"marketplace-sales-report-list.js","sourceRoot":"","sources":["../../../../server/graphql/types/marketplace-report/marketplace-sales-report-list.ts"],"names":[],"mappings":";;;;;;AAAA,8DAA6B;AAEhB,QAAA,0BAA0B,GAAG,IAAA,qBAAG,EAAA;;;;;CAK5C,CAAA"}
@@ -0,0 +1,65 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ exports.MarketplaceSalesReport = void 0;
7
+ const graphql_tag_1 = __importDefault(require("graphql-tag"));
8
+ exports.MarketplaceSalesReport = (0, graphql_tag_1.default) `
9
+ type MarketplaceSalesReport {
10
+ fulfilmentCenter: String
11
+ voucherAmount: Float
12
+ shippingRebate: Float
13
+ commissionFee: Float
14
+ serviceFee: Float
15
+ transactionFee: String
16
+ totalRealeasedAmount: Float
17
+ voucherCode: String
18
+ shippingMode: String
19
+ status: String
20
+ orderNo: String
21
+ orderCreatedAt: String
22
+ buyerUsername: String
23
+ payTime: String
24
+ totalAmount: Float
25
+ refundAmount: Float
26
+ shippingProvider: String
27
+ storeName: String
28
+ storeDescription: String
29
+ promotionId: String
30
+ originalPrice: Float
31
+ paidPrice: Float
32
+ sku: String
33
+ qty: Int
34
+ variationId: String
35
+ variationName: String
36
+ productName: String
37
+ productSku: String
38
+ productDiscount: Float
39
+ paymentFee: Float
40
+ shippingFee: Float
41
+ actualShippingFee: Float
42
+ marketplaceShippingFeeVoucher: Float
43
+ sellerShippingFeeVoucher: Float
44
+ shippingFeePaidByCustomer: Float
45
+ promotionalCharges: Float
46
+ ordersMarketplaceFeesTotal: Float
47
+ ordersMarketingFeesTotal: Float
48
+ ordersSalesTotal: Float
49
+ ordersLogisticsTotal: Float
50
+ itemPriceCredit: Float
51
+ marketplaceBonus: Float
52
+ marketplaceBonusSeller: Float
53
+ shippingFeeDiscountMarketplace: Float
54
+ shippingFeeDiscountSeller: Float
55
+ promotionalChargesFlexiCombo: Float
56
+ autoShippingSubsidyMarketplace: Float
57
+ grandTotal: Float
58
+ originalShippingFee: Float
59
+ taxAmount: Float
60
+ fulfillmentCenter: String
61
+ variationSku: String
62
+ itemCommissionFee: Float
63
+ }
64
+ `;
65
+ //# sourceMappingURL=marketplace-sales-report.js.map
@@ -0,0 +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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAwDxC,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/marketplace-base",
3
- "version": "4.0.7",
3
+ "version": "4.0.12",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -24,9 +24,9 @@
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.0.7",
28
- "@things-factory/integration-marketplace": "^4.0.7",
29
- "@things-factory/shell": "^4.0.7"
27
+ "@things-factory/integration-fulfillment": "^4.0.12",
28
+ "@things-factory/integration-marketplace": "^4.0.12",
29
+ "@things-factory/shell": "^4.0.12"
30
30
  },
31
- "gitHead": "035fa60359aefa9b9111f807fc7e8db6a15a4a6e"
31
+ "gitHead": "29d59ff95fcb473cb43c6f798cd04f3ec3a779a0"
32
32
  }
@@ -8,6 +8,8 @@ import { MarketplaceProduct } from './marketplace-product'
8
8
  import { MarketplaceProductAttribute } from './marketplace-product-attribute'
9
9
  import { MarketplaceProductCategory } from './marketplace-product-category'
10
10
  import { MarketplaceProductVariation } from './marketplace-product-variation'
11
+ import { MarketplaceRefundOrderItem } from './marketplace-refund-order-item'
12
+ import { MarketplaceRefundOrder } from './marketplace-refund-order'
11
13
 
12
14
  export const entities = [
13
15
  MarketplaceProductVariationPrice,
@@ -19,7 +21,9 @@ export const entities = [
19
21
  MarketplaceProductCategory,
20
22
  MarketplaceOrder,
21
23
  MarketplaceOrderItem,
22
- MarketplaceOrderShipping
24
+ MarketplaceOrderShipping,
25
+ MarketplaceRefundOrder,
26
+ MarketplaceRefundOrderItem
23
27
  ]
24
28
 
25
29
  export {
@@ -32,5 +36,7 @@ export {
32
36
  MarketplaceProductVariation,
33
37
  MarketplaceOrder,
34
38
  MarketplaceOrderItem,
35
- MarketplaceOrderShipping
39
+ MarketplaceOrderShipping,
40
+ MarketplaceRefundOrder,
41
+ MarketplaceRefundOrderItem
36
42
  }
@@ -42,6 +42,15 @@ export class MarketplaceOrderItem {
42
42
  @Column({ nullable: true })
43
43
  paidPrice: string
44
44
 
45
+ @Column({ type: 'float', nullable: true })
46
+ originalPrice: number
47
+
48
+ @Column({ type: 'float', nullable: true })
49
+ discount: number
50
+
51
+ @Column({ nullable: true })
52
+ promotionId: string
53
+
45
54
  @Column({ nullable: true })
46
55
  packageId: string
47
56
 
@@ -63,6 +72,57 @@ export class MarketplaceOrderItem {
63
72
  @Column({ nullable: true })
64
73
  description: string
65
74
 
75
+ @Column({ nullable: true, type: 'float' })
76
+ paymentFee: number
77
+
78
+ @Column({ nullable: true, type: 'float' })
79
+ commissionFee: number
80
+
81
+ @Column({ nullable: true, type: 'float' })
82
+ shippingFeePaidByCustomer: number
83
+
84
+ @Column({ nullable: true, type: 'float' })
85
+ promotionalCharges: number
86
+
87
+ @Column({ nullable: true, type: 'float' })
88
+ ordersMarketplaceFeesTotal: number
89
+
90
+ @Column({ nullable: true, type: 'float' })
91
+ ordersMarketingFeesTotal: number
92
+
93
+ @Column({ nullable: true, type: 'float' })
94
+ ordersSalesTotal: number
95
+
96
+ @Column({ nullable: true, type: 'float' })
97
+ ordersLogisticsTotal: number
98
+
99
+ @Column({ nullable: true, type: 'float' })
100
+ itemPriceCredit: number
101
+
102
+ @Column({ nullable: true, type: 'float' })
103
+ marketplaceBonus: number
104
+
105
+ @Column({ nullable: true, type: 'float' })
106
+ marketplaceBonusSeller: number
107
+
108
+ @Column({ nullable: true, type: 'float' })
109
+ shippingFeeDiscountMarketplace: number
110
+
111
+ @Column({ nullable: true, type: 'float' })
112
+ shippingFeeDiscountSeller: number
113
+
114
+ @Column({ nullable: true, type: 'float' })
115
+ promotionalChargesFlexiCombo: number
116
+
117
+ @Column({ nullable: true, type: 'float' })
118
+ autoShippingSubsidyMarketplace: number
119
+
120
+ @Column({ nullable: true, type: 'float' })
121
+ originalShippingFee: number
122
+
123
+ @Column({ nullable: true, type: 'float' })
124
+ taxAmount: number
125
+
66
126
  @CreateDateColumn()
67
127
  createdAt: Date
68
128
 
@@ -142,6 +142,18 @@ export class MarketplaceOrderShipping {
142
142
  @Column({ nullable: true })
143
143
  invoice: string
144
144
 
145
+ @Column({ type: 'float', nullable: true })
146
+ shippingFee: number
147
+
148
+ @Column({ type: 'float', nullable: true })
149
+ actualShippingFee: number
150
+
151
+ @Column({ type: 'float', nullable: true })
152
+ marketplaceShippingFeeVoucher: number
153
+
154
+ @Column({ type: 'float', nullable: true })
155
+ sellerShippingFeeVoucher: number
156
+
145
157
  @CreateDateColumn()
146
158
  createdAt: Date
147
159
 
@@ -104,6 +104,33 @@ export class MarketplaceOrder {
104
104
  @Column({ nullable: true })
105
105
  isSplitted: boolean
106
106
 
107
+ @Column({ nullable: true })
108
+ buyerUsername: string
109
+
110
+ @Column({ nullable: true })
111
+ payTime: Date
112
+
113
+ @Column({ nullable: true, type: 'float' })
114
+ commissionFee: Number
115
+
116
+ @Column({ nullable: true, type: 'float' })
117
+ serviceFee: Number
118
+
119
+ @Column({ nullable: true, type: 'float' })
120
+ transactionFee: Number
121
+
122
+ @Column({ nullable: true, type: 'float' })
123
+ totalRealeasedAmount: Number
124
+
125
+ @Column({ nullable: true, type: 'float' })
126
+ voucherAmount: String
127
+
128
+ @Column({ nullable: true, type: 'float' })
129
+ shippingRebate: Number
130
+
131
+ @Column({ nullable: true })
132
+ shippingMode: String
133
+
107
134
  @CreateDateColumn()
108
135
  createdAt: Date
109
136
 
@@ -0,0 +1,65 @@
1
+ import {
2
+ Column,
3
+ CreateDateColumn,
4
+ Entity,
5
+ Index,
6
+ ManyToOne,
7
+ PrimaryGeneratedColumn,
8
+ UpdateDateColumn
9
+ } from 'typeorm'
10
+
11
+ import { User } from '@things-factory/auth-base'
12
+ import { Domain } from '@things-factory/shell'
13
+ import { MarketplaceRefundOrder } from '../entities'
14
+ import { MarketplaceProductVariation } from '../entities'
15
+ @Entity()
16
+ @Index(
17
+ 'ix_marketplace-refund-order-item_0',
18
+ (marketplaceRefundOrderItem: MarketplaceRefundOrderItem) => [marketplaceRefundOrderItem.domain, marketplaceRefundOrderItem.name],
19
+ { unique: true }
20
+ )
21
+ export class MarketplaceRefundOrderItem {
22
+ @PrimaryGeneratedColumn('uuid')
23
+ id: string
24
+
25
+ @ManyToOne(type => Domain)
26
+ domain: Domain
27
+
28
+ @ManyToOne(type => MarketplaceRefundOrder)
29
+ marketplaceRefundOrder: MarketplaceRefundOrder
30
+
31
+ @ManyToOne(type => MarketplaceProductVariation)
32
+ marketplaceProductVariation: MarketplaceProductVariation
33
+
34
+ @Column()
35
+ name: string
36
+
37
+ @Column()
38
+ orderItemId: string
39
+
40
+ @Column({ nullable: true })
41
+ status: string
42
+
43
+ @Column({ nullable: true, type: 'float' })
44
+ price: number
45
+
46
+ @Column({ nullable: true })
47
+ qty: string
48
+
49
+ @CreateDateColumn()
50
+ createdAt: Date
51
+
52
+ @UpdateDateColumn()
53
+ updatedAt: Date
54
+
55
+ @ManyToOne(type => User, {
56
+ nullable: true
57
+ })
58
+ creator: User
59
+
60
+ @ManyToOne(type => User, {
61
+ nullable: true
62
+ })
63
+ updater: User
64
+ }
65
+