@things-factory/marketplace-base 3.7.7 → 3.7.11

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 (16) hide show
  1. package/dist-server/entities/marketplace-order.js +28 -0
  2. package/dist-server/entities/marketplace-order.js.map +1 -1
  3. package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js +34 -8
  4. package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js.map +1 -1
  5. package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js +19 -7
  6. package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js.map +1 -1
  7. package/dist-server/graphql/resolvers/marketplace-report/marketplace-sales-report.js +15 -3
  8. package/dist-server/graphql/resolvers/marketplace-report/marketplace-sales-report.js.map +1 -1
  9. package/dist-server/graphql/types/marketplace-report/marketplace-sales-report.js +12 -1
  10. package/dist-server/graphql/types/marketplace-report/marketplace-sales-report.js.map +1 -1
  11. package/package.json +3 -3
  12. package/server/entities/marketplace-order.ts +21 -0
  13. package/server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.ts +45 -16
  14. package/server/graphql/resolvers/marketplace-order/sync-marketplace-order.ts +23 -7
  15. package/server/graphql/resolvers/marketplace-report/marketplace-sales-report.ts +15 -3
  16. package/server/graphql/types/marketplace-report/marketplace-sales-report.ts +12 -1
package/dist-server/entities/marketplace-order.js CHANGED
@@ -135,6 +135,34 @@ __decorate([
135
135
  (0, typeorm_1.Column)({ nullable: true }),
136
136
  __metadata("design:type", Date)
137
137
  ], MarketplaceOrder.prototype, "payTime", void 0);
138
+ __decorate([
139
+ (0, typeorm_1.Column)({ nullable: true, type: 'float' }),
140
+ __metadata("design:type", Number)
141
+ ], MarketplaceOrder.prototype, "commissionFee", void 0);
142
+ __decorate([
143
+ (0, typeorm_1.Column)({ nullable: true, type: 'float' }),
144
+ __metadata("design:type", Number)
145
+ ], MarketplaceOrder.prototype, "serviceFee", void 0);
146
+ __decorate([
147
+ (0, typeorm_1.Column)({ nullable: true, type: 'float' }),
148
+ __metadata("design:type", Number)
149
+ ], MarketplaceOrder.prototype, "transactionFee", void 0);
150
+ __decorate([
151
+ (0, typeorm_1.Column)({ nullable: true, type: 'float' }),
152
+ __metadata("design:type", Number)
153
+ ], MarketplaceOrder.prototype, "totalRealeasedAmount", void 0);
154
+ __decorate([
155
+ (0, typeorm_1.Column)({ nullable: true, type: 'float' }),
156
+ __metadata("design:type", String)
157
+ ], MarketplaceOrder.prototype, "voucherAmount", void 0);
158
+ __decorate([
159
+ (0, typeorm_1.Column)({ nullable: true, type: 'float' }),
160
+ __metadata("design:type", Number)
161
+ ], MarketplaceOrder.prototype, "shippingRebate", void 0);
162
+ __decorate([
163
+ (0, typeorm_1.Column)({ nullable: true }),
164
+ __metadata("design:type", String)
165
+ ], MarketplaceOrder.prototype, "shippingMode", void 0);
138
166
  __decorate([
139
167
  (0, typeorm_1.CreateDateColumn)(),
140
168
  __metadata("design:type", Date)
package/dist-server/entities/marketplace-order.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,qFAA2E;AAC3E,qFAA0E;AAC1E,iDAA8C;AAE9C,0CAAkD;AAQlD,IAAa,gBAAgB,GAA7B,MAAa,gBAAgB;CAuG5B,CAAA;AArGC;IADC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;4CACrB;AAGV;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;gDAAA;AAGd;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,0CAAgB,CAAC;kDAClB,0CAAgB,oBAAhB,0CAAgB;0DAAA;AAGlC;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,+BAAoB,EAAE,oBAAoB,CAAC,EAAE,CAAC,oBAAoB,CAAC,gBAAgB,CAAC;;+DAC1D;AAG7C;IADC,IAAA,gBAAM,GAAE;;8CACG;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACZ;AAGf;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACX;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACvB;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACvB;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CACf;AAGZ;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDACb;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,OAAO;oDAAA;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACT;AAGlB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;0DACH;AAGxB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6DACA;AAG3B;IADC,IAAA,gBAAM,GAAE;;gDACK;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wDACL;AAGtB;IADC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,2CAAiB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;kDACtC,2CAAiB,oBAAjB,2CAAiB;2DAAA;AAGpC;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACX,IAAI;wDAAA;AAGpB;IADC,IAAA,gBAAM,GAAE;8BACO,IAAI;wDAAA;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;oDACR;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uDACN;AAGrB;IADC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAClB,IAAI;iDAAA;AAGb;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;mDAAA;AAGf;IADC,IAAA,0BAAgB,GAAE;8BACR,IAAI;mDAAA;AAKf;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;iDAAA;AAKb;IAHC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;iDAAA;AAtGF,gBAAgB;IAN5B,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EACJ,wBAAwB,EACxB,CAAC,gBAAkC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,CAAC,IAAI,CAAC,EACxF,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;GACY,gBAAgB,CAuG5B;AAvGY,4CAAgB"}
1
+ {"version":3,"file":"marketplace-order.js","sourceRoot":"","sources":["../../server/entities/marketplace-order.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js CHANGED
@@ -74,6 +74,16 @@ exports.syncAllMarketplaceOrder = {
74
74
  marketplaceOrder.orderUpdatedAt = order.orderUpdatedAt;
75
75
  marketplaceOrder.marketplaceStore = marketplaceStore;
76
76
  marketplaceOrder.domain = marketplaceStore.domain;
77
+ marketplaceOrder.buyerUsername = order.buyerUsername;
78
+ marketplaceOrder.payTime = order.payTime;
79
+ marketplaceOrder.serviceFee = order.serviceFee;
80
+ marketplaceOrder.commissionFee = order.commissionFee;
81
+ marketplaceOrder.transactionFee = order.transactionFee;
82
+ marketplaceOrder.shippingMode = order.shippingMode;
83
+ marketplaceOrder.voucherAmount = order.voucherAmount;
84
+ marketplaceOrder.totalRealeasedAmount = order.totalRealeasedAmount;
85
+ marketplaceOrder.voucherCode = order.voucherCode;
86
+ marketplaceOrder.shippingRebate = order.shippingRebate;
77
87
  const existingMarketplaceOrder = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrder).findOne({
78
88
  where: { domain: marketplaceStore.domain, name: order.name },
79
89
  relations: [
@@ -138,8 +148,8 @@ exports.syncAllMarketplaceOrder = {
138
148
  }
139
149
  marketplaceOrder = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrder).save(marketplaceOrder);
140
150
  let savedMarketplaceOrderShipping = new entities_1.MarketplaceOrderShipping();
151
+ let savedMarketplaceOrderShippings = [];
141
152
  if (order === null || order === void 0 ? void 0 : order.orderShipping) {
142
- let savedMarketplaceOrderShippings = [];
143
153
  const orderShipping = order.orderShipping;
144
154
  let marketplaceOrderShipping = new entities_1.MarketplaceOrderShipping();
145
155
  marketplaceOrderShipping.name = utils_1.NoGenerator.orderShipping();
@@ -151,30 +161,37 @@ exports.syncAllMarketplaceOrder = {
151
161
  marketplaceOrderShipping.attentionTo = orderShipping.attentionTo;
152
162
  marketplaceOrderShipping.city = orderShipping.city;
153
163
  marketplaceOrderShipping.country = orderShipping.country;
164
+ marketplaceOrderShipping.state = (orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.state) || null;
154
165
  marketplaceOrderShipping.postCode = orderShipping.postCode;
155
166
  marketplaceOrderShipping.phone1 = orderShipping.phone1;
156
167
  marketplaceOrderShipping.phone2 = orderShipping.phone2;
157
- marketplaceOrderShipping.trackingNo = order === null || order === void 0 ? void 0 : order.trackingNo;
168
+ marketplaceOrderShipping.trackingNo = (order === null || order === void 0 ? void 0 : order.trackingNo) || null;
158
169
  marketplaceOrderShipping.orderNoRef = marketplaceOrder.orderNo;
159
170
  marketplaceOrderShipping.subOrderNoRef = marketplaceOrder.orderNo;
160
171
  marketplaceOrderShipping.marketplaceStore = marketplaceStore;
161
172
  marketplaceOrderShipping.creator = user;
162
173
  marketplaceOrderShipping.domain = marketplaceStore.domain;
174
+ marketplaceOrderShipping.shippingFee = orderShipping.shippingFee;
175
+ marketplaceOrderShipping.actualShippingFee = orderShipping.actualShippingFee;
176
+ marketplaceOrderShipping.marketplaceShippingFeeVoucher = orderShipping.marketplaceShippingFeeVoucher;
177
+ marketplaceOrderShipping.sellerShippingFeeVoucher = orderShipping.sellerShippingFeeVoucher;
163
178
  if (existingMarketplaceOrder) {
164
179
  if (existingMarketplaceOrder.isSplitted) {
165
180
  let existingOrderShippings = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrderShipping).find({
166
181
  where: { domain, marketplaceStore, orderNoRef: marketplaceOrder.orderNo }
167
182
  });
168
183
  existingOrderShippings = existingOrderShippings.map(item => {
169
- 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, postCode: orderShipping.postCode, phone1: orderShipping.phone1, phone2: orderShipping.phone2, trackingNo: order.trackingNo });
184
+ 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, postCode: orderShipping.postCode, phone1: orderShipping.phone1, phone2: orderShipping.phone2, trackingNo: order.trackingNo, shippingFee: orderShipping.shippingFee, actualShippingFee: orderShipping.actualShippingFee, marketplaceShippingFeeVoucher: orderShipping.marketplaceShippingFeeVoucher, sellerShippingFeeVoucher: orderShipping.sellerShippingFeeVoucher });
170
185
  });
171
186
  savedMarketplaceOrderShippings = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrderShipping).save(existingOrderShippings);
172
187
  }
173
188
  else {
174
- let existingOrderShipping;
175
- existingOrderShipping = existingMarketplaceOrder.marketplaceOrderItems[0].marketplaceOrderShipping;
176
- 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 });
177
- savedMarketplaceOrderShipping = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
189
+ if (existingMarketplaceOrder === null || existingMarketplaceOrder === void 0 ? void 0 : existingMarketplaceOrder.marketplaceOrderItems) {
190
+ let existingOrderShipping;
191
+ existingOrderShipping = existingMarketplaceOrder.marketplaceOrderItems[0].marketplaceOrderShipping;
192
+ 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 });
193
+ savedMarketplaceOrderShipping = await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
194
+ }
178
195
  }
179
196
  }
180
197
  else {
@@ -210,7 +227,13 @@ exports.syncAllMarketplaceOrder = {
210
227
  marketplaceOrderItem.marketplaceOrder = marketplaceOrder;
211
228
  marketplaceOrderItem.trackingCode = order.trackingNo;
212
229
  marketplaceOrderItem.marketplaceOrderShipping = savedMarketplaceOrderShipping;
230
+ marketplaceOrderItem.originalPrice = item.originalPrice;
231
+ marketplaceOrderItem.discount = item.discount;
232
+ marketplaceOrderItem.promotionId = item.promotionId;
213
233
  marketplaceOrderItem.creator = user;
234
+ if (marketplaceStore.platform === 'lazada' && item.paymentFee) {
235
+ marketplaceOrderItem.paymentFee = item.paymentFee;
236
+ }
214
237
  marketplaceOrderItems.push(Object.assign({}, marketplaceOrderItem));
215
238
  if (foundVariation === null || foundVariation === void 0 ? void 0 : foundVariation.primaryUnitValue)
216
239
  orderTotalWeight += parseFloat(foundVariation.primaryUnitValue.toFixed(3)) * item.qty || 0;
@@ -237,7 +260,7 @@ exports.syncAllMarketplaceOrder = {
237
260
  nonMatchedOrderItems.push(Object.assign({}, item));
238
261
  }
239
262
  });
240
- if (nonMatchedOrderItems.length > 0 && cancelStatuses.includes(marketplaceOrder.status))
263
+ if (nonMatchedOrderItems.length > 0 && !cancelStatuses.includes(marketplaceOrder.status))
241
264
  await (0, typeorm_1.getRepository)(entities_1.MarketplaceOrderItem).delete(nonMatchedOrderItems);
242
265
  existingOrderItems = marketplaceOrderItems.map(item => {
243
266
  const matchedOrderItem = existingOrderItems.find(itm => itm.name == item.name &&
@@ -281,6 +304,9 @@ exports.syncAllMarketplaceOrder = {
281
304
  page++;
282
305
  hasMorePage = more;
283
306
  }
307
+ else {
308
+ hasMorePage = false;
309
+ }
284
310
  }
285
311
  }
286
312
  return true;
package/dist-server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sync-all-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sync-all-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.ts"],"names":[],"mappings":"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"}
package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js CHANGED
@@ -64,6 +64,14 @@ exports.syncMarketplaceOrder = {
64
64
  marketplaceOrder.domain = marketplaceStore.domain;
65
65
  marketplaceOrder.buyerUsername = order.buyerUsername;
66
66
  marketplaceOrder.payTime = order.payTime;
67
+ marketplaceOrder.serviceFee = order.serviceFee;
68
+ marketplaceOrder.commissionFee = order.commissionFee;
69
+ marketplaceOrder.transactionFee = order.transactionFee;
70
+ marketplaceOrder.shippingMode = order.shippingMode;
71
+ marketplaceOrder.voucherAmount = order.voucherAmount;
72
+ marketplaceOrder.totalRealeasedAmount = order.totalRealeasedAmount;
73
+ marketplaceOrder.voucherCode = order.voucherCode;
74
+ marketplaceOrder.shippingRebate = order.shippingRebate;
67
75
  const existingMarketplaceOrder = await tx.getRepository(entities_1.MarketplaceOrder).findOne({
68
76
  where: { domain: marketplaceStore.domain, name: order.name },
69
77
  relations: [
@@ -137,18 +145,18 @@ exports.syncMarketplaceOrder = {
137
145
  marketplaceOrderShipping.attentionTo = orderShipping.attentionTo;
138
146
  marketplaceOrderShipping.city = orderShipping.city;
139
147
  marketplaceOrderShipping.country = orderShipping.country;
140
- marketplaceOrderShipping.state = orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.state;
148
+ marketplaceOrderShipping.state = (orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.state) || null;
141
149
  marketplaceOrderShipping.postCode = orderShipping.postCode;
142
150
  marketplaceOrderShipping.phone1 = orderShipping.phone1;
143
151
  marketplaceOrderShipping.phone2 = orderShipping.phone2;
144
- marketplaceOrderShipping.trackingNo = order === null || order === void 0 ? void 0 : order.trackingNo;
152
+ marketplaceOrderShipping.trackingNo = (order === null || order === void 0 ? void 0 : order.trackingNo) || null;
145
153
  marketplaceOrderShipping.orderNoRef = marketplaceOrder.orderNo;
146
154
  marketplaceOrderShipping.subOrderNoRef = marketplaceOrder.orderNo;
147
155
  marketplaceOrderShipping.marketplaceStore = marketplaceStore;
148
156
  marketplaceOrderShipping.creator = user;
149
157
  marketplaceOrderShipping.domain = marketplaceStore.domain;
150
- marketplaceOrderShipping.shippingFee = parseFloat(orderShipping.shippingFee) || 0;
151
- marketplaceOrderShipping.actualShippingFee = parseFloat(orderShipping.actualShippingFee) || 0;
158
+ marketplaceOrderShipping.shippingFee = orderShipping.shippingFee;
159
+ marketplaceOrderShipping.actualShippingFee = orderShipping.actualShippingFee;
152
160
  marketplaceOrderShipping.marketplaceShippingFeeVoucher = orderShipping.marketplaceShippingFeeVoucher;
153
161
  marketplaceOrderShipping.sellerShippingFeeVoucher = orderShipping.sellerShippingFeeVoucher;
154
162
  if (existingMarketplaceOrder) {
@@ -159,7 +167,7 @@ exports.syncMarketplaceOrder = {
159
167
  where: { domain, marketplaceStore, orderNoRef: marketplaceOrder.orderNo }
160
168
  });
161
169
  existingOrderShippings = existingOrderShippings.map(item => {
162
- 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 });
170
+ 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 });
163
171
  });
164
172
  savedMarketplaceOrderShippings = await tx
165
173
  .getRepository(entities_1.MarketplaceOrderShipping)
@@ -169,7 +177,11 @@ exports.syncMarketplaceOrder = {
169
177
  if (existingMarketplaceOrder === null || existingMarketplaceOrder === void 0 ? void 0 : existingMarketplaceOrder.marketplaceOrderItems) {
170
178
  let existingOrderShipping;
171
179
  existingOrderShipping = existingMarketplaceOrder.marketplaceOrderItems[0].marketplaceOrderShipping;
172
- 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 });
180
+ marketplaceOrderShipping = Object.assign(Object.assign(Object.assign({}, existingOrderShipping), marketplaceOrderShipping), { trackingNo: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.trackingNo)
181
+ ? marketplaceOrderShipping.trackingNo
182
+ : (existingOrderShipping === null || existingOrderShipping === void 0 ? void 0 : existingOrderShipping.trackingNo)
183
+ ? existingOrderShipping.trackingNo
184
+ : marketplaceOrderShipping.trackingNo, updater: user });
173
185
  savedMarketplaceOrderShipping = await tx
174
186
  .getRepository(entities_1.MarketplaceOrderShipping)
175
187
  .save(marketplaceOrderShipping);
@@ -244,7 +256,7 @@ exports.syncMarketplaceOrder = {
244
256
  nonMatchedOrderItems.push(Object.assign({}, item));
245
257
  }
246
258
  });
247
- if (nonMatchedOrderItems.length > 0 && cancelStatuses.includes(marketplaceOrder.status))
259
+ if (nonMatchedOrderItems.length > 0 && !cancelStatuses.includes(marketplaceOrder.status))
248
260
  await tx.getRepository(entities_1.MarketplaceOrderItem).delete(nonMatchedOrderItems);
249
261
  existingOrderItems = marketplaceOrderItems.map(item => {
250
262
  const matchedOrderItem = existingOrderItems.find(itm => itm.name == item.name &&
package/dist-server/graphql/resolvers/marketplace-order/sync-marketplace-order.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"sync-marketplace-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/marketplace-order/sync-marketplace-order.ts"],"names":[],"mappings":";;;AAGA,uDAAyE;AACzE,qFAA2F;AAC3F,qFAAoF;AACpF,iDAA8C;AAE9C,gDAK0B;AAC1B,0CAA4C;AAE/B,QAAA,oBAAoB,GAAG;IAClC,KAAK,CAAC,oBAAoB,CAAC,CAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,OAAY;QAC5E,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,MAAM,gBAAgB,GAAqB,MAAM,kCAAQ,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAA;QAEtF,IAAI,IAAI,GAAW,CAAC,CAAA;QACpB,IAAI,WAAW,GAAY,IAAI,CAAA;QAC/B,IAAI,WAAmB,CAAA;QACvB,IAAI,KAAK,GAAW,GAAG,CAAA;QACvB,MAAM,cAAc,GAAa,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;QAC1D,MAAM,sBAAsB,GAAa,CAAC,WAAW,EAAE,gBAAgB,CAAC,CAAA;QAExE,OAAO,WAAW,EAAE;YAClB,MAAM,EAAE,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,GAAG,MAAM,kCAAQ,CAAC,cAAc,CAAC,gBAAgB,EAAE;gBAC3F,QAAQ;gBACR,MAAM;gBACN,UAAU,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE;gBAC3B,WAAW;aACZ,CAAC,CAAA;YAEF,IAAI,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,KAAI,CAAC;gBAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAA;YAE1F,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,iBAAiB,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACjD,IAAI,KAAK,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAA;gBAEhC,IAAI,qBAAqB,GAAG,EAAE,CAAA;gBAC9B,IAAI,aAAa,GAAG,EAAE,CAAA;gBACtB,IAAI,gBAAwB,CAAA;gBAE5B,IAAI,gBAAgB,CAAC,QAAQ,IAAI,QAAQ,EAAE;oBACzC,IAAI,KAAK,CAAC,UAAU,IAAI,EAAE,EAAE;wBAC1B,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC;6BACzC,MAAM,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;4BACxB,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE;gCAC3C,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAA;6BACjC;4BACD,OAAO,OAAO,CAAA;wBAChB,CAAC,EAAE,EAAE,CAAC;6BACL,IAAI,CAAC,GAAG,CAAC,CAAA;qBACb;oBAED,MAAM,oBAAoB,GAAQ,EAAE,CAAA;oBACpC,KAAK,CAAC,gBAAgB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;wBAC7C,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;wBAChC,oBAAoB,CAAC,GAAG,CAAC,GAAG,KAAK,CAAA;oBACnC,CAAC,CAAC,CAAA;oBAEF,gBAAgB,GAAG,oBAAoB,CAAC,QAAQ,CAAA;iBACjD;gBAED,IAAI,gBAAgB,GAAqB,IAAI,2BAAgB,EAAE,CAAA;gBAC/D,gBAAgB,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAA;gBAClC,gBAAgB,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;gBACxC,gBAAgB,CAAC,SAAS,GAAG,KAAK,CAAC,SAAS,CAAA;gBAC5C,gBAAgB,CAAC,WAAW,GAAG,KAAK,CAAC,WAAW,CAAA;gBAChD,gBAAgB,CAAC,MAAM,GAAG,KAAK,CAAC,MAAM,CAAA;gBACtC,gBAAgB,CAAC,MAAM,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAA;gBACvC,gBAAgB,CAAC,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAA;gBAC9E,gBAAgB,CAAC,gBAAgB,GAAG,KAAK,CAAC,gBAAgB,CAAA;gBAC1D,gBAAgB,CAAC,cAAc,GAAG,KAAK,CAAC,cAAc,CAAA;gBACtD,gBAAgB,CAAC,cAAc,GAAG,KAAK,CAAC,cAAc,CAAA;gBACtD,gBAAgB,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;gBACpD,gBAAgB,CAAC,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAA;gBACjD,gBAAgB,CAAC,aAAa,GAAG,KAAK,CAAC,aAAa,CAAA;gBACpD,gBAAgB,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAA;gBAExC,MAAM,wBAAwB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAC,OAAO,CAAC;oBAClG,KAAK,EAAE,EAAE,MAAM,EAAE,gBAAgB,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE;oBAC5D,SAAS,EAAE;wBACT,QAAQ;wBACR,mBAAmB;wBACnB,uBAAuB;wBACvB,mDAAmD;wBACnD,gDAAgD;qBACjD;iBACF,CAAC,CAAA;gBAEF,IAAI,wBAAwB,EAAE;oBAC5B,IAAI,aAAa,GAAQ,EAAE,CAAA;oBAE3B,IAAI,CAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,aAAa,KAAI,gBAAgB,EAAE;wBAC/D,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAA;wBAClE,aAAa,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;qBAClD;oBAED,gBAAgB,iDACX,wBAAwB,GACxB,gBAAgB,KACnB,aAAa,EAAE,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,EACnE,OAAO,EAAE,IAAI,GACd,CAAA;oBAED,IAAI,cAAc,CAAC,QAAQ,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAI,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,cAAc,CAAA,EAAE;wBACxF,IAAI,wBAAwB,CAAC,UAAU,EAAE;4BACvC,MAAM,iBAAiB,GAAsB,gBAAgB,CAAC,iBAAiB,CAAA;4BAC/E,MAAM,QAAQ,GAAW,iBAAiB,CAAC,QAAQ,CAAA;4BACnD,MAAM,eAAe,GAAW,MAAM,EAAE,CAAC,aAAa,CAAC,cAAM,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;4BAC1G,MAAM,iBAAiB,GAAe,MAAM,IAAA,+BAAoB,EAAC,eAAe,CAAC,CAAA;4BACjF,MAAM,kBAAkB,GAAW,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;4BAE1D,IAAI,EAAE,KAAK,EAAE,aAAa,EAAE,GAAQ,MAAM,wCAAc,CAAC,iBAAiB,CAAC,iBAAiB,EAAE;gCAC5F,kBAAkB;gCAClB,KAAK,EAAE,gBAAgB,CAAC,OAAO;6BAChC,CAAC,CAAA;4BAEF,aAAa,GAAG,aAAa,CAAC,MAAM,CAAC,UAAU,KAAK;gCAClD,OAAO,CAAC,sBAAsB,CAAC,QAAQ,CAAC,KAAK,CAAC,MAAM,CAAC,CAAA;4BACvD,CAAC,CAAC,CAAA;4BAEF,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,MAAM,EAAE;gCACzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oCAC7C,MAAM,cAAc,GAAW,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;oCAClD,MAAM,wCAAc,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,EAAE,kBAAkB,EAAE,cAAc,EAAE,CAAC,CAAA;iCACnG;6BACF;yBACF;6BAAM;4BACL,MAAM,iBAAiB,GAAsB,gBAAgB,CAAC,iBAAiB,CAAA;4BAC/E,MAAM,QAAQ,GAAW,iBAAiB,CAAC,QAAQ,CAAA;4BAEnD,MAAM,eAAe,GAAW,MAAM,EAAE,CAAC,aAAa,CAAC,cAAM,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE,CAAC,CAAA;4BAC1G,MAAM,iBAAiB,GAAe,MAAM,IAAA,+BAAoB,EAAC,eAAe,CAAC,CAAA;4BACjF,MAAM,kBAAkB,GAAW,iBAAiB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;4BAE1D,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,GAAQ,MAAM,wCAAc,CAAC,iBAAiB,CAAC,iBAAiB,EAAE;gCAC9F,kBAAkB;gCAClB,KAAK,EAAE,gBAAgB,CAAC,OAAO;6BAChC,CAAC,CAAA;4BAEF,MAAM,kBAAkB,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;4BAElD,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;gCACxD,MAAM,wCAAc,CAAC,kBAAkB,CAAC,iBAAiB,EAAE;oCACzD,kBAAkB;oCAClB,cAAc,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE;iCACpC,CAAC,CAAA;6BACH;yBACF;qBACF;iBACF;gBAED,gBAAgB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAA;gBAElF,IAAI,6BAA6B,GAA6B,IAAI,mCAAwB,EAAE,CAAA;gBAC5F,IAAI,8BAA8B,GAA+B,EAAE,CAAA;gBAEnE,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,EAAE;oBACxB,MAAM,aAAa,GAAQ,KAAK,CAAC,aAAa,CAAA;oBAE9C,IAAI,wBAAwB,GAA6B,IAAI,mCAAwB,EAAE,CAAA;oBACvF,wBAAwB,CAAC,IAAI,GAAG,mBAAW,CAAC,aAAa,EAAE,CAAA;oBAC3D,wBAAwB,CAAC,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAA;oBAC1D,wBAAwB,CAAC,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAA;oBAC1D,wBAAwB,CAAC,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAA;oBAC1D,wBAAwB,CAAC,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAA;oBAC1D,wBAAwB,CAAC,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAA;oBAC1D,wBAAwB,CAAC,WAAW,GAAG,aAAa,CAAC,WAAW,CAAA;oBAChE,wBAAwB,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,CAAA;oBAClD,wBAAwB,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,CAAA;oBACxD,wBAAwB,CAAC,KAAK,GAAG,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK,CAAA;oBACrD,wBAAwB,CAAC,QAAQ,GAAG,aAAa,CAAC,QAAQ,CAAA;oBAC1D,wBAAwB,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAA;oBACtD,wBAAwB,CAAC,MAAM,GAAG,aAAa,CAAC,MAAM,CAAA;oBACtD,wBAAwB,CAAC,UAAU,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,CAAA;oBACvD,wBAAwB,CAAC,UAAU,GAAG,gBAAgB,CAAC,OAAO,CAAA;oBAC9D,wBAAwB,CAAC,aAAa,GAAG,gBAAgB,CAAC,OAAO,CAAA;oBACjE,wBAAwB,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;oBAC5D,wBAAwB,CAAC,OAAO,GAAG,IAAI,CAAA;oBACvC,wBAAwB,CAAC,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAA;oBACzD,wBAAwB,CAAC,WAAW,GAAG,UAAU,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;oBACjF,wBAAwB,CAAC,iBAAiB,GAAG,UAAU,CAAC,aAAa,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;oBAC7F,wBAAwB,CAAC,6BAA6B,GAAG,aAAa,CAAC,6BAA6B,CAAA;oBACpG,wBAAwB,CAAC,wBAAwB,GAAG,aAAa,CAAC,wBAAwB,CAAA;oBAE1F,IAAI,wBAAwB,EAAE;wBAC5B,IAAI,wBAAwB,CAAC,UAAU,EAAE;4BACvC,IAAI,sBAAsB,GAA+B,MAAM,EAAE;iCAC9D,aAAa,CAAC,mCAAwB,CAAC;iCACvC,IAAI,CAAC;gCACJ,KAAK,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,UAAU,EAAE,gBAAgB,CAAC,OAAO,EAAE;6BAC1E,CAAC,CAAA;4BAEJ,sBAAsB,GAAG,sBAAsB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gCACzD,uCACK,IAAI,KACP,QAAQ,EAAE,aAAa,CAAC,QAAQ,EAChC,QAAQ,EAAE,aAAa,CAAC,QAAQ,EAChC,QAAQ,EAAE,aAAa,CAAC,QAAQ,EAChC,QAAQ,EAAE,aAAa,CAAC,QAAQ,EAChC,QAAQ,EAAE,aAAa,CAAC,QAAQ,EAChC,WAAW,EAAE,aAAa,CAAC,WAAW,EACtC,IAAI,EAAE,aAAa,CAAC,IAAI,EACxB,OAAO,EAAE,aAAa,CAAC,OAAO,EAC9B,KAAK,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK,EAC3B,QAAQ,EAAE,aAAa,CAAC,QAAQ,EAChC,MAAM,EAAE,aAAa,CAAC,MAAM,EAC5B,MAAM,EAAE,aAAa,CAAC,MAAM,EAC5B,KAAK,EAAE,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,KAAK,EAC3B,UAAU,EAAE,KAAK,CAAC,UAAU,IAC7B;4BACH,CAAC,CAAC,CAAA;4BAEF,8BAA8B,GAAG,MAAM,EAAE;iCACtC,aAAa,CAAC,mCAAwB,CAAC;iCACvC,IAAI,CAAC,sBAAsB,CAAC,CAAA;yBAChC;6BAAM;4BACL,IAAI,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,qBAAqB,EAAE;gCACnD,IAAI,qBAA+C,CAAA;gCACnD,qBAAqB,GAAG,wBAAwB,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAA;gCAElG,wBAAwB,iDACnB,qBAAqB,GACrB,wBAAwB,KAC3B,UAAU,EAAE,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,UAAU,EAAC,CAAC,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,qBAAqB,CAAC,UAAU,EACnF,OAAO,EAAE,IAAI,GACd,CAAA;gCAED,6BAA6B,GAAG,MAAM,EAAE;qCACrC,aAAa,CAAC,mCAAwB,CAAC;qCACvC,IAAI,CAAC,wBAAwB,CAAC,CAAA;6BAClC;yBACF;qBACF;yBAAM;wBACL,6BAA6B,GAAG,MAAM,EAAE;6BACrC,aAAa,CAAC,mCAAwB,CAAC;6BACvC,IAAI,CAAC,wBAAwB,CAAC,CAAA;qBAClC;iBACF;gBAED,IAAI,gBAAgB,GAAW,CAAC,CAAA;gBAChC,IAAI,cAAc,CAAA;gBAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBAChD,IAAI,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;oBAC9B,cAAc,GAAG,MAAM,EAAE;yBACtB,aAAa,CAAC,sCAA2B,CAAC;yBAC1C,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,gBAAgB,CAAC,MAAM,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC,CAAA;oBAEzF,IAAI,CAAC,cAAc,EAAE;wBACnB,IAAI,YAAY,GAAQ;4BACtB,WAAW,EAAE,IAAI,CAAC,WAAW;4BAC7B,IAAI,EAAE,IAAI,CAAC,aAAa;4BACxB,YAAY,EAAE,IAAI,CAAC,YAAY;4BAC/B,UAAU,EAAE,IAAI,CAAC,GAAG;4BACpB,MAAM,EAAE,UAAU;yBACnB,CAAA;wBAED,MAAM,EAAE,CAAC,aAAa,CAAC,sCAA2B,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;wBACtE,cAAc,GAAG,YAAY,CAAA;qBAC9B;oBAED,IAAI,oBAAoB,GAAyB,IAAI,+BAAoB,EAAE,CAAA;oBAC3E,oBAAoB,CAAC,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAA;oBACrD,oBAAoB,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAA;oBACrC,oBAAoB,CAAC,GAAG,GAAG,IAAI,CAAC,GAAG,CAAA;oBACnC,oBAAoB,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,CAAA;oBAC/C,oBAAoB,CAAC,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAA;oBACrD,oBAAoB,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;oBAC7C,oBAAoB,CAAC,2BAA2B,GAAG,cAAc,CAAA;oBACjE,oBAAoB,CAAC,YAAY,GAAG,KAAK,CAAC,UAAU,CAAA;oBACpD,oBAAoB,CAAC,gBAAgB,GAAG,gBAAgB,CAAA;oBACxD,oBAAoB,CAAC,wBAAwB,GAAG,6BAA6B,CAAA;oBAC7E,oBAAoB,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAA;oBACvD,oBAAoB,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAA;oBAC7C,oBAAoB,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAA;oBACnD,oBAAoB,CAAC,OAAO,GAAG,IAAI,CAAA;oBACnC,IAAI,gBAAgB,CAAC,QAAQ,KAAK,QAAQ,IAAI,IAAI,CAAC,UAAU,EAAE;wBAC7D,oBAAoB,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAA;qBAClD;oBAED,qBAAqB,CAAC,IAAI,mBAAM,oBAAoB,EAAG,CAAA;oBAEvD,IAAI,cAAc,aAAd,cAAc,uBAAd,cAAc,CAAE,gBAAgB;wBAClC,gBAAgB,IAAI,UAAU,CAAC,cAAc,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,IAAI,CAAC,CAAA;iBAC7F;gBAED,IAAI,wBAAwB,EAAE;oBAC5B,IAAI,wBAAwB,CAAC,UAAU,EAAE;wBACvC,IAAI,kBAAkB,GAA2B,EAAE,CAAA;wBACnD,kBAAkB,GAAG,wBAAwB,CAAC,qBAAqB,CAAA;wBAEnE,qBAAqB,GAAG,kBAAkB,CAAC,MAAM,CAC/C,GAAG,CAAC,EAAE,CACJ,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI;4BACrB,GAAG,CAAC,2BAA2B,CAAC,WAAW,IAAI,IAAI,CAAC,2BAA2B,CAAC,WAAW,CAC9F,CAAA;wBACD,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,oBAAoB,CAAC,EAAE;4BACvE,uCACK,oBAAoB,KACvB,MAAM,EAAE,KAAK,CAAC,MAAM,EACpB,2BAA2B,EAAE,cAAc,EAC3C,YAAY,EAAE,KAAK,CAAC,UAAU,IAC/B;wBACH,CAAC,CAAC,CAAA;qBACH;yBAAM;wBACL,IAAI,kBAAkB,GAA2B,EAAE,CAAA;wBACnD,kBAAkB,GAAG,wBAAwB,CAAC,qBAAqB,CAAA;wBAEnE,IAAI,kBAAkB,CAAC,MAAM,GAAG,qBAAqB,CAAC,MAAM,EAAE;4BAC5D,IAAI,oBAAoB,GAAG,EAAE,CAAA;4BAC7B,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gCAC5B,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,IAAI,CACjD,GAAG,CAAC,EAAE,CACJ,GAAG,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI;oCACtB,GAAG,CAAC,2BAA2B,CAAC,WAAW,IAAI,IAAI,CAAC,2BAA2B,CAAC,WAAW,CAC9F,CAAA;gCACD,IAAI,CAAC,gBAAgB,EAAE;oCACrB,oBAAoB,CAAC,IAAI,mBAAM,IAAI,EAAG,CAAA;iCACvC;4BACH,CAAC,CAAC,CAAA;4BACF,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,IAAI,cAAc,CAAC,QAAQ,CAAC,gBAAgB,CAAC,MAAM,CAAC;gCACrF,MAAM,EAAE,CAAC,aAAa,CAAC,+BAAoB,CAAC,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAA;4BAE3E,kBAAkB,GAAG,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gCACpD,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,IAAI,CAC9C,GAAG,CAAC,EAAE,CACJ,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI;oCACrB,GAAG,CAAC,2BAA2B,CAAC,WAAW,IAAI,IAAI,CAAC,2BAA2B,CAAC,WAAW,CAC9F,CAAA;gCACD,IAAI,gBAAgB,EAAE;oCACpB,qDACK,gBAAgB,GAChB,IAAI,KACP,OAAO,EAAE,IAAI,IACd;iCACF;4BACH,CAAC,CAAC,CAAA;yBACH;6BAAM;4BACL,kBAAkB,GAAG,qBAAqB,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;gCACpD,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,IAAI,CAC9C,GAAG,CAAC,EAAE,CACJ,GAAG,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI;oCACrB,GAAG,CAAC,2BAA2B,CAAC,WAAW,IAAI,IAAI,CAAC,2BAA2B,CAAC,WAAW,CAC9F,CAAA;gCACD,IAAI,gBAAgB,EAAE;oCACpB,qDACK,gBAAgB,GAChB,IAAI,KACP,OAAO,EAAE,IAAI,IACd;iCACF;qCAAM;oCACL,uCACK,IAAI,KACP,OAAO,EAAE,IAAI,IACd;iCACF;4BACH,CAAC,CAAC,CAAA;yBACH;wBAED,qBAAqB,GAAG,kBAAkB,CAAA;wBAE1C,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,EAAE;4BACxB,6BAA6B,CAAC,WAAW,GAAG,gBAAgB,CAAA;4BAC5D,6BAA6B,GAAG,MAAM,EAAE;iCACrC,aAAa,CAAC,mCAAwB,CAAC;iCACvC,IAAI,CAAC,6BAA6B,CAAC,CAAA;yBACvC;qBACF;iBACF;qBAAM;oBACL,IAAI,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,aAAa,EAAE;wBACxB,6BAA6B,CAAC,WAAW,GAAG,gBAAgB,CAAA;wBAC5D,6BAA6B,GAAG,MAAM,EAAE;6BACrC,aAAa,CAAC,mCAAwB,CAAC;6BACvC,IAAI,CAAC,6BAA6B,CAAC,CAAA;qBACvC;iBACF;gBAED,MAAM,EAAE,CAAC,aAAa,CAAC,+BAAoB,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAA;gBAExE,IAAI,CAAC,IAAI,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE;oBACrC,WAAW,GAAG,KAAK,CAAC,IAAI,CAAA;iBACzB;aACF;YAED,IAAI,IAAI;gBAAE,IAAI,EAAE,CAAA;YAChB,WAAW,GAAG,IAAI,CAAA;SACnB;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CACF,CAAA"}
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-report/marketplace-sales-report.js CHANGED
@@ -20,6 +20,7 @@ exports.marketplaceSalesReportsResolver = {
20
20
  qb.leftJoinAndSelect('moi.domain', 'domain')
21
21
  .leftJoinAndSelect('moi.marketplaceOrderShipping', 'mos')
22
22
  .leftJoinAndSelect('moi.marketplaceOrder', 'mo')
23
+ .leftJoinAndSelect('mo.fulfillmentCenter', 'fc')
23
24
  .leftJoinAndSelect('mo.marketplaceStore', 'ms')
24
25
  .leftJoinAndSelect('moi.marketplaceProductVariation', 'mpv')
25
26
  .leftJoinAndSelect('mpv.marketplaceProduct', 'mp')
@@ -51,6 +52,7 @@ exports.marketplaceSalesReportsResolver = {
51
52
  const total = await qb.getCount();
52
53
  items = items.map(item => {
53
54
  return {
55
+ fulfilmentCenter: item.fc_name,
54
56
  orderNo: item.mo_name,
55
57
  orderCreatedAt: item.mo_order_created_at,
56
58
  buyerUsername: item.mo_buyer_username,
@@ -63,9 +65,10 @@ exports.marketplaceSalesReportsResolver = {
63
65
  promotionId: item.moi_promotion_id,
64
66
  originalPrice: item.moi_original_price,
65
67
  paidPrice: item.moi_paid_price,
66
- sku: item.mpv_name,
68
+ sku: item.mpv_sku,
67
69
  qty: item.moi_qty,
68
- variationSku: item.mpv_variation_sku,
70
+ variationId: item.mpv_variation_id,
71
+ variationName: item.mpv_name,
69
72
  productName: item.mp_name,
70
73
  productSku: item.mp_isku,
71
74
  productDiscount: item.moi_discount,
@@ -73,7 +76,16 @@ exports.marketplaceSalesReportsResolver = {
73
76
  shippingFee: item.mos_shipping_fee,
74
77
  actualShippingFee: item.mos_actual_shipping_fee,
75
78
  marketplaceShippingFeeVoucher: item.mos_marketplace_shipping_fee_voucher,
76
- sellerShippingFeeVoucher: item.mos_seller_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
77
89
  };
78
90
  });
79
91
  return { items, total };
package/dist-server/graphql/resolvers/marketplace-report/marketplace-sales-report.js.map CHANGED
@@ -1 +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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"}
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
@@ -7,6 +7,16 @@ exports.MarketplaceSalesReport = void 0;
7
7
  const graphql_tag_1 = __importDefault(require("graphql-tag"));
8
8
  exports.MarketplaceSalesReport = (0, graphql_tag_1.default) `
9
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
10
20
  orderNo: String
11
21
  orderCreatedAt: String
12
22
  buyerUsername: String
@@ -21,7 +31,8 @@ exports.MarketplaceSalesReport = (0, graphql_tag_1.default) `
21
31
  paidPrice: Float
22
32
  sku: String
23
33
  qty: Int
24
- variationSku: String
34
+ variationId: String
35
+ variationName: String
25
36
  productName: String
26
37
  productSku: String
27
38
  productDiscount: Float
package/dist-server/graphql/types/marketplace-report/marketplace-sales-report.js.map CHANGED
@@ -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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqCxC,CAAA"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@things-factory/marketplace-base",
3
- "version": "3.7.7",
3
+ "version": "3.7.11",
4
4
  "main": "dist-server/index.js",
5
5
  "browser": "client/index.js",
6
6
  "things-factory": true,
@@ -25,8 +25,8 @@
25
25
  },
26
26
  "dependencies": {
27
27
  "@things-factory/integration-fulfillment": "^3.7.7",
28
- "@things-factory/integration-marketplace": "^3.7.7",
28
+ "@things-factory/integration-marketplace": "^3.7.11",
29
29
  "@things-factory/shell": "^3.7.5"
30
30
  },
31
- "gitHead": "7e1cfc771ca9e8970d90493d3049d4d589e96f08"
31
+ "gitHead": "fea83ab8a7f82df4d78e69a504a4877c3b93248e"
32
32
  }
package/server/entities/marketplace-order.ts CHANGED
@@ -110,6 +110,27 @@ export class MarketplaceOrder {
110
110
  @Column({ nullable: true })
111
111
  payTime: Date
112
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
+
113
134
  @CreateDateColumn()
114
135
  createdAt: Date
115
136
 
package/server/graphql/resolvers/marketplace-order/sync-all-marketplace-order.ts CHANGED
@@ -92,6 +92,16 @@ export const syncAllMarketplaceOrder = {
92
92
  marketplaceOrder.orderUpdatedAt = order.orderUpdatedAt
93
93
  marketplaceOrder.marketplaceStore = marketplaceStore
94
94
  marketplaceOrder.domain = marketplaceStore.domain
95
+ marketplaceOrder.buyerUsername = order.buyerUsername
96
+ marketplaceOrder.payTime = order.payTime
97
+ marketplaceOrder.serviceFee = order.serviceFee
98
+ marketplaceOrder.commissionFee = order.commissionFee
99
+ marketplaceOrder.transactionFee = order.transactionFee
100
+ marketplaceOrder.shippingMode = order.shippingMode
101
+ marketplaceOrder.voucherAmount = order.voucherAmount
102
+ marketplaceOrder.totalRealeasedAmount = order.totalRealeasedAmount
103
+ marketplaceOrder.voucherCode = order.voucherCode
104
+ marketplaceOrder.shippingRebate = order.shippingRebate
95
105
 
96
106
  const existingMarketplaceOrder: MarketplaceOrder = await getRepository(MarketplaceOrder).findOne({
97
107
  where: { domain: marketplaceStore.domain, name: order.name },
@@ -174,9 +184,9 @@ export const syncAllMarketplaceOrder = {
174
184
  marketplaceOrder = await getRepository(MarketplaceOrder).save(marketplaceOrder)
175
185
 
176
186
  let savedMarketplaceOrderShipping: MarketplaceOrderShipping = new MarketplaceOrderShipping()
187
+ let savedMarketplaceOrderShippings: MarketplaceOrderShipping[] = []
177
188
 
178
189
  if (order?.orderShipping) {
179
- let savedMarketplaceOrderShippings: MarketplaceOrderShipping[] = []
180
190
  const orderShipping: any = order.orderShipping
181
191
 
182
192
  let marketplaceOrderShipping: MarketplaceOrderShipping = new MarketplaceOrderShipping()
@@ -189,15 +199,20 @@ export const syncAllMarketplaceOrder = {
189
199
  marketplaceOrderShipping.attentionTo = orderShipping.attentionTo
190
200
  marketplaceOrderShipping.city = orderShipping.city
191
201
  marketplaceOrderShipping.country = orderShipping.country
202
+ marketplaceOrderShipping.state = orderShipping?.state || null
192
203
  marketplaceOrderShipping.postCode = orderShipping.postCode
193
204
  marketplaceOrderShipping.phone1 = orderShipping.phone1
194
205
  marketplaceOrderShipping.phone2 = orderShipping.phone2
195
- marketplaceOrderShipping.trackingNo = order?.trackingNo
206
+ marketplaceOrderShipping.trackingNo = order?.trackingNo || null
196
207
  marketplaceOrderShipping.orderNoRef = marketplaceOrder.orderNo
197
208
  marketplaceOrderShipping.subOrderNoRef = marketplaceOrder.orderNo
198
209
  marketplaceOrderShipping.marketplaceStore = marketplaceStore
199
210
  marketplaceOrderShipping.creator = user
200
211
  marketplaceOrderShipping.domain = marketplaceStore.domain
212
+ marketplaceOrderShipping.shippingFee = orderShipping.shippingFee
213
+ marketplaceOrderShipping.actualShippingFee = orderShipping.actualShippingFee
214
+ marketplaceOrderShipping.marketplaceShippingFeeVoucher = orderShipping.marketplaceShippingFeeVoucher
215
+ marketplaceOrderShipping.sellerShippingFeeVoucher = orderShipping.sellerShippingFeeVoucher
201
216
 
202
217
  if (existingMarketplaceOrder) {
203
218
  if (existingMarketplaceOrder.isSplitted) {
@@ -221,7 +236,11 @@ export const syncAllMarketplaceOrder = {
221
236
  postCode: orderShipping.postCode,
222
237
  phone1: orderShipping.phone1,
223
238
  phone2: orderShipping.phone2,
224
- trackingNo: order.trackingNo
239
+ trackingNo: order.trackingNo,
240
+ shippingFee: orderShipping.shippingFee,
241
+ actualShippingFee: orderShipping.actualShippingFee,
242
+ marketplaceShippingFeeVoucher: orderShipping.marketplaceShippingFeeVoucher,
243
+ sellerShippingFeeVoucher: orderShipping.sellerShippingFeeVoucher
225
244
  }
226
245
  })
227
246
 
@@ -229,19 +248,21 @@ export const syncAllMarketplaceOrder = {
229
248
  existingOrderShippings
230
249
  )
231
250
  } else {
232
- let existingOrderShipping: MarketplaceOrderShipping
233
- existingOrderShipping = existingMarketplaceOrder.marketplaceOrderItems[0].marketplaceOrderShipping
234
-
235
- marketplaceOrderShipping = {
236
- ...existingOrderShipping,
237
- ...marketplaceOrderShipping,
238
- trackingNo: order?.trackingNo ? order.trackingNo : existingOrderShipping.trackingNo,
239
- updater: user
240
- }
251
+ if (existingMarketplaceOrder?.marketplaceOrderItems) {
252
+ let existingOrderShipping: MarketplaceOrderShipping
253
+ existingOrderShipping = existingMarketplaceOrder.marketplaceOrderItems[0].marketplaceOrderShipping
254
+
255
+ marketplaceOrderShipping = {
256
+ ...existingOrderShipping,
257
+ ...marketplaceOrderShipping,
258
+ trackingNo: order?.trackingNo ? order.trackingNo : existingOrderShipping.trackingNo,
259
+ updater: user
260
+ }
241
261
 
242
- savedMarketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).save(
243
- marketplaceOrderShipping
244
- )
262
+ savedMarketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).save(
263
+ marketplaceOrderShipping
264
+ )
265
+ }
245
266
  }
246
267
  } else {
247
268
  savedMarketplaceOrderShipping = await getRepository(MarketplaceOrderShipping).save(
@@ -282,7 +303,13 @@ export const syncAllMarketplaceOrder = {
282
303
  marketplaceOrderItem.marketplaceOrder = marketplaceOrder
283
304
  marketplaceOrderItem.trackingCode = order.trackingNo
284
305
  marketplaceOrderItem.marketplaceOrderShipping = savedMarketplaceOrderShipping
306
+ marketplaceOrderItem.originalPrice = item.originalPrice
307
+ marketplaceOrderItem.discount = item.discount
308
+ marketplaceOrderItem.promotionId = item.promotionId
285
309
  marketplaceOrderItem.creator = user
310
+ if (marketplaceStore.platform === 'lazada' && item.paymentFee) {
311
+ marketplaceOrderItem.paymentFee = item.paymentFee
312
+ }
286
313
 
287
314
  marketplaceOrderItems.push({ ...marketplaceOrderItem })
288
315
 
@@ -324,7 +351,7 @@ export const syncAllMarketplaceOrder = {
324
351
  nonMatchedOrderItems.push({ ...item })
325
352
  }
326
353
  })
327
- if (nonMatchedOrderItems.length > 0 && cancelStatuses.includes(marketplaceOrder.status))
354
+ if (nonMatchedOrderItems.length > 0 && !cancelStatuses.includes(marketplaceOrder.status))
328
355
  await getRepository(MarketplaceOrderItem).delete(nonMatchedOrderItems)
329
356
 
330
357
  existingOrderItems = marketplaceOrderItems.map(item => {
@@ -390,6 +417,8 @@ export const syncAllMarketplaceOrder = {
390
417
 
391
418
  if (more) page++
392
419
  hasMorePage = more
420
+ } else {
421
+ hasMorePage = false
393
422
  }
394
423
  }
395
424
  }
package/server/graphql/resolvers/marketplace-order/sync-marketplace-order.ts CHANGED
@@ -80,6 +80,14 @@ export const syncMarketplaceOrder = {
80
80
  marketplaceOrder.domain = marketplaceStore.domain
81
81
  marketplaceOrder.buyerUsername = order.buyerUsername
82
82
  marketplaceOrder.payTime = order.payTime
83
+ marketplaceOrder.serviceFee = order.serviceFee
84
+ marketplaceOrder.commissionFee = order.commissionFee
85
+ marketplaceOrder.transactionFee = order.transactionFee
86
+ marketplaceOrder.shippingMode = order.shippingMode
87
+ marketplaceOrder.voucherAmount = order.voucherAmount
88
+ marketplaceOrder.totalRealeasedAmount = order.totalRealeasedAmount
89
+ marketplaceOrder.voucherCode = order.voucherCode
90
+ marketplaceOrder.shippingRebate = order.shippingRebate
83
91
 
84
92
  const existingMarketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
85
93
  where: { domain: marketplaceStore.domain, name: order.name },
@@ -173,18 +181,18 @@ export const syncMarketplaceOrder = {
173
181
  marketplaceOrderShipping.attentionTo = orderShipping.attentionTo
174
182
  marketplaceOrderShipping.city = orderShipping.city
175
183
  marketplaceOrderShipping.country = orderShipping.country
176
- marketplaceOrderShipping.state = orderShipping?.state
184
+ marketplaceOrderShipping.state = orderShipping?.state || null
177
185
  marketplaceOrderShipping.postCode = orderShipping.postCode
178
186
  marketplaceOrderShipping.phone1 = orderShipping.phone1
179
187
  marketplaceOrderShipping.phone2 = orderShipping.phone2
180
- marketplaceOrderShipping.trackingNo = order?.trackingNo
188
+ marketplaceOrderShipping.trackingNo = order?.trackingNo || null
181
189
  marketplaceOrderShipping.orderNoRef = marketplaceOrder.orderNo
182
190
  marketplaceOrderShipping.subOrderNoRef = marketplaceOrder.orderNo
183
191
  marketplaceOrderShipping.marketplaceStore = marketplaceStore
184
192
  marketplaceOrderShipping.creator = user
185
193
  marketplaceOrderShipping.domain = marketplaceStore.domain
186
- marketplaceOrderShipping.shippingFee = parseFloat(orderShipping.shippingFee) || 0
187
- marketplaceOrderShipping.actualShippingFee = parseFloat(orderShipping.actualShippingFee) || 0
194
+ marketplaceOrderShipping.shippingFee = orderShipping.shippingFee
195
+ marketplaceOrderShipping.actualShippingFee = orderShipping.actualShippingFee
188
196
  marketplaceOrderShipping.marketplaceShippingFeeVoucher = orderShipping.marketplaceShippingFeeVoucher
189
197
  marketplaceOrderShipping.sellerShippingFeeVoucher = orderShipping.sellerShippingFeeVoucher
190
198
 
@@ -212,7 +220,11 @@ export const syncMarketplaceOrder = {
212
220
  phone1: orderShipping.phone1,
213
221
  phone2: orderShipping.phone2,
214
222
  email: orderShipping?.email,
215
- trackingNo: order.trackingNo
223
+ trackingNo: order?.trackingNo,
224
+ shippingFee: orderShipping.shippingFee,
225
+ actualShippingFee: orderShipping.actualShippingFee,
226
+ marketplaceShippingFeeVoucher: orderShipping.marketplaceShippingFeeVoucher,
227
+ sellerShippingFeeVoucher: orderShipping.sellerShippingFeeVoucher
216
228
  }
217
229
  })
218
230
 
@@ -227,7 +239,11 @@ export const syncMarketplaceOrder = {
227
239
  marketplaceOrderShipping = {
228
240
  ...existingOrderShipping,
229
241
  ...marketplaceOrderShipping,
230
- trackingNo: order?.trackingNo ? order.trackingNo : existingOrderShipping.trackingNo,
242
+ trackingNo: marketplaceOrderShipping?.trackingNo
243
+ ? marketplaceOrderShipping.trackingNo
244
+ : existingOrderShipping?.trackingNo
245
+ ? existingOrderShipping.trackingNo
246
+ : marketplaceOrderShipping.trackingNo,
231
247
  updater: user
232
248
  }
233
249
 
@@ -323,7 +339,7 @@ export const syncMarketplaceOrder = {
323
339
  nonMatchedOrderItems.push({ ...item })
324
340
  }
325
341
  })
326
- if (nonMatchedOrderItems.length > 0 && cancelStatuses.includes(marketplaceOrder.status))
342
+ if (nonMatchedOrderItems.length > 0 && !cancelStatuses.includes(marketplaceOrder.status))
327
343
  await tx.getRepository(MarketplaceOrderItem).delete(nonMatchedOrderItems)
328
344
 
329
345
  existingOrderItems = marketplaceOrderItems.map(item => {
package/server/graphql/resolvers/marketplace-report/marketplace-sales-report.ts CHANGED
@@ -26,6 +26,7 @@ export const marketplaceSalesReportsResolver = {
26
26
  qb.leftJoinAndSelect('moi.domain', 'domain')
27
27
  .leftJoinAndSelect('moi.marketplaceOrderShipping', 'mos')
28
28
  .leftJoinAndSelect('moi.marketplaceOrder', 'mo')
29
+ .leftJoinAndSelect('mo.fulfillmentCenter', 'fc')
29
30
  .leftJoinAndSelect('mo.marketplaceStore', 'ms')
30
31
  .leftJoinAndSelect('moi.marketplaceProductVariation', 'mpv')
31
32
  .leftJoinAndSelect('mpv.marketplaceProduct', 'mp')
@@ -69,6 +70,7 @@ export const marketplaceSalesReportsResolver = {
69
70
 
70
71
  items = items.map(item => {
71
72
  return {
73
+ fulfilmentCenter: item.fc_name,
72
74
  orderNo: item.mo_name,
73
75
  orderCreatedAt: item.mo_order_created_at,
74
76
  buyerUsername: item.mo_buyer_username,
@@ -81,9 +83,10 @@ export const marketplaceSalesReportsResolver = {
81
83
  promotionId: item.moi_promotion_id,
82
84
  originalPrice: item.moi_original_price,
83
85
  paidPrice: item.moi_paid_price,
84
- sku: item.mpv_name,
86
+ sku: item.mpv_sku,
85
87
  qty: item.moi_qty,
86
- variationSku: item.mpv_variation_sku,
88
+ variationId: item.mpv_variation_id,
89
+ variationName: item.mpv_name,
87
90
  productName: item.mp_name,
88
91
  productSku: item.mp_isku,
89
92
  productDiscount: item.moi_discount,
@@ -91,7 +94,16 @@ export const marketplaceSalesReportsResolver = {
91
94
  shippingFee: item.mos_shipping_fee,
92
95
  actualShippingFee: item.mos_actual_shipping_fee,
93
96
  marketplaceShippingFeeVoucher: item.mos_marketplace_shipping_fee_voucher,
94
- sellerShippingFeeVoucher: item.mos_seller_shipping_fee_voucher
97
+ sellerShippingFeeVoucher: item.mos_seller_shipping_fee_voucher,
98
+ voucherAmount: item.mo_voucher_amount,
99
+ shippingRebate: item.mo_shipping_rebate,
100
+ commissionFee: item.mo_commission_fee,
101
+ serviceFee: item.mo_service_fee,
102
+ transactionFee: item.mo_transaction_fee,
103
+ totalRealeasedAmount: item.mo_total_realeased_amount,
104
+ voucherCode: item.mo_voucher_code,
105
+ shippingMode: item.mo_shipping_mode,
106
+ status: item.mo_status
95
107
  }
96
108
  })
97
109
 
package/server/graphql/types/marketplace-report/marketplace-sales-report.ts CHANGED
@@ -2,6 +2,16 @@ import gql from 'graphql-tag'
2
2
 
3
3
  export const MarketplaceSalesReport = gql`
4
4
  type MarketplaceSalesReport {
5
+ fulfilmentCenter: String
6
+ voucherAmount: Float
7
+ shippingRebate: Float
8
+ commissionFee: Float
9
+ serviceFee: Float
10
+ transactionFee: String
11
+ totalRealeasedAmount: Float
12
+ voucherCode: String
13
+ shippingMode: String
14
+ status: String
5
15
  orderNo: String
6
16
  orderCreatedAt: String
7
17
  buyerUsername: String
@@ -16,7 +26,8 @@ export const MarketplaceSalesReport = gql`
16
26
  paidPrice: Float
17
27
  sku: String
18
28
  qty: Int
19
- variationSku: String
29
+ variationId: String
30
+ variationName: String
20
31
  productName: String
21
32
  productSku: String
22
33
  productDiscount: Float