@things-factory/sales-base 4.3.303 → 4.3.306
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-server/controllers/ecommerce/powrup-controller.js +11 -9
- package/dist-server/controllers/ecommerce/powrup-controller.js.map +1 -1
- package/dist-server/service/order-package/order-package.js +18 -3
- package/dist-server/service/order-package/order-package.js.map +1 -1
- package/package.json +4 -4
- package/server/controllers/ecommerce/powrup-controller.ts +11 -10
- package/server/service/order-package/order-package.ts +12 -0
|
@@ -101,26 +101,28 @@ class PowrupController {
|
|
|
101
101
|
let orderPackageRepo = trxMgr ? trxMgr.getRepository(order_package_1.OrderPackage) : (0, typeorm_1.getRepository)(order_package_1.OrderPackage);
|
|
102
102
|
let releaseGoodRepo = trxMgr ? trxMgr.getRepository(release_good_1.ReleaseGood) : (0, typeorm_1.getRepository)(release_good_1.ReleaseGood);
|
|
103
103
|
let orderPackages = await orderPackageRepo.find({
|
|
104
|
-
where: { releaseGood, bizplace: releaseGood.bizplace }
|
|
104
|
+
where: { releaseGood, bizplace: releaseGood.bizplace },
|
|
105
|
+
relations: ['releaseGood', 'releaseGood.lastMileDelivery']
|
|
105
106
|
});
|
|
106
107
|
if (orderPackages === null || orderPackages === void 0 ? void 0 : orderPackages.length) {
|
|
107
108
|
await Promise.all(orderPackages
|
|
108
109
|
.filter(op => (op === null || op === void 0 ? void 0 : op.marketRtsCallSuccess) == undefined)
|
|
109
110
|
.map(async (op) => {
|
|
111
|
+
var _a, _b;
|
|
110
112
|
if (!(op === null || op === void 0 ? void 0 : op.packageId))
|
|
111
113
|
throw new Error('Order package id is not found');
|
|
112
|
-
if (
|
|
114
|
+
if (op.lmdOption && !(op === null || op === void 0 ? void 0 : op.parcelId))
|
|
113
115
|
return;
|
|
114
116
|
let orderInformation = {
|
|
115
117
|
refOrderId: releaseGood.refOrderId,
|
|
116
118
|
packageId: op.packageId
|
|
117
119
|
};
|
|
118
|
-
if (releaseGood.lmdOption) {
|
|
119
|
-
let releaseGoodQuery = await releaseGoodRepo.findOne({
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
})
|
|
123
|
-
orderInformation = Object.assign(Object.assign({}, orderInformation), { awb: op.airwayBill, trackingNo: op.trackingNo, lmdOption: releaseGood.lmdOption, shipperName:
|
|
120
|
+
if ((_a = op === null || op === void 0 ? void 0 : op.releaseGood) === null || _a === void 0 ? void 0 : _a.lmdOption) {
|
|
121
|
+
// let releaseGoodQuery: ReleaseGood = await releaseGoodRepo.findOne({
|
|
122
|
+
// where: { id: releaseGood.id },
|
|
123
|
+
// relations: ['lastMileDelivery']
|
|
124
|
+
// })
|
|
125
|
+
orderInformation = Object.assign(Object.assign({}, orderInformation), { awb: op.airwayBill, trackingNo: op.trackingNo, lmdOption: (_b = op === null || op === void 0 ? void 0 : op.releaseGood) === null || _b === void 0 ? void 0 : _b.lmdOption, shipperName: op.releaseGood.lastMileDelivery.platform });
|
|
124
126
|
}
|
|
125
127
|
try {
|
|
126
128
|
await integration_powrup_1.PowrupAPI.initiateShipment(powrup, Object.assign(Object.assign({}, orderInformation), { context: { state: { domain, user } } }));
|
|
@@ -137,7 +139,7 @@ class PowrupController {
|
|
|
137
139
|
}
|
|
138
140
|
}
|
|
139
141
|
async fetchDocument(powrup, releaseGood, domain, user, trxMgr) {
|
|
140
|
-
if (
|
|
142
|
+
if (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.lmdOption) {
|
|
141
143
|
return;
|
|
142
144
|
}
|
|
143
145
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"powrup-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/powrup-controller.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"powrup-controller.js","sourceRoot":"","sources":["../../../server/controllers/ecommerce/powrup-controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,7 +8,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
|
|
|
8
8
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
9
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
10
|
};
|
|
11
|
-
var _a, _b, _c, _d, _e;
|
|
11
|
+
var _a, _b, _c, _d, _e, _f;
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
exports.OrderPackage = void 0;
|
|
14
14
|
const type_graphql_1 = require("type-graphql");
|
|
@@ -17,6 +17,7 @@ const auth_base_1 = require("@things-factory/auth-base");
|
|
|
17
17
|
const biz_base_1 = require("@things-factory/biz-base");
|
|
18
18
|
const env_1 = require("@things-factory/env");
|
|
19
19
|
const shell_1 = require("@things-factory/shell");
|
|
20
|
+
const integration_lmd_1 = require("@things-factory/integration-lmd");
|
|
20
21
|
const __1 = require("../");
|
|
21
22
|
const release_good_1 = require("../release-good/release-good");
|
|
22
23
|
const ORMCONFIG = env_1.config.get('ormconfig', {});
|
|
@@ -115,6 +116,20 @@ __decorate([
|
|
|
115
116
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
116
117
|
__metadata("design:type", String)
|
|
117
118
|
], OrderPackage.prototype, "parcelId", void 0);
|
|
119
|
+
__decorate([
|
|
120
|
+
(0, typeorm_1.Column)({ nullable: true }),
|
|
121
|
+
(0, type_graphql_1.Field)({ nullable: true }),
|
|
122
|
+
__metadata("design:type", Boolean)
|
|
123
|
+
], OrderPackage.prototype, "lmdOption", void 0);
|
|
124
|
+
__decorate([
|
|
125
|
+
(0, typeorm_1.ManyToOne)(type => integration_lmd_1.LastMileDelivery),
|
|
126
|
+
(0, type_graphql_1.Field)(type => integration_lmd_1.LastMileDelivery, { nullable: true }),
|
|
127
|
+
__metadata("design:type", typeof (_d = typeof integration_lmd_1.LastMileDelivery !== "undefined" && integration_lmd_1.LastMileDelivery) === "function" ? _d : Object)
|
|
128
|
+
], OrderPackage.prototype, "lastMileDelivery", void 0);
|
|
129
|
+
__decorate([
|
|
130
|
+
(0, typeorm_1.RelationId)((orderPackage) => orderPackage.lastMileDelivery),
|
|
131
|
+
__metadata("design:type", String)
|
|
132
|
+
], OrderPackage.prototype, "lastMileDeliveryId", void 0);
|
|
118
133
|
__decorate([
|
|
119
134
|
(0, typeorm_1.Column)({
|
|
120
135
|
type: DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|
|
@@ -142,7 +157,7 @@ __decorate([
|
|
|
142
157
|
nullable: true
|
|
143
158
|
}),
|
|
144
159
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
145
|
-
__metadata("design:type", typeof (
|
|
160
|
+
__metadata("design:type", typeof (_e = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _e : Object)
|
|
146
161
|
], OrderPackage.prototype, "creator", void 0);
|
|
147
162
|
__decorate([
|
|
148
163
|
(0, typeorm_1.RelationId)((orderPackage) => orderPackage.creator),
|
|
@@ -153,7 +168,7 @@ __decorate([
|
|
|
153
168
|
nullable: true
|
|
154
169
|
}),
|
|
155
170
|
(0, type_graphql_1.Field)({ nullable: true }),
|
|
156
|
-
__metadata("design:type", typeof (
|
|
171
|
+
__metadata("design:type", typeof (_f = typeof auth_base_1.User !== "undefined" && auth_base_1.User) === "function" ? _f : Object)
|
|
157
172
|
], OrderPackage.prototype, "updater", void 0);
|
|
158
173
|
__decorate([
|
|
159
174
|
(0, typeorm_1.RelationId)((orderPackage) => orderPackage.creator),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order-package.js","sourceRoot":"","sources":["../../../server/service/order-package/order-package.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+CAAoD;AACpD,qCAUgB;AAEhB,yDAAgD;AAChD,uDAAmD;AACnD,6CAA4C;AAC5C,iDAA8C;
|
|
1
|
+
{"version":3,"file":"order-package.js","sourceRoot":"","sources":["../../../server/service/order-package/order-package.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/sales-base",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.306",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -28,14 +28,14 @@
|
|
|
28
28
|
"@things-factory/biz-base": "^4.3.301",
|
|
29
29
|
"@things-factory/code-base": "^4.3.281",
|
|
30
30
|
"@things-factory/integration-accounting": "^4.3.301",
|
|
31
|
-
"@things-factory/integration-powrup": "^4.3.
|
|
31
|
+
"@things-factory/integration-powrup": "^4.3.304",
|
|
32
32
|
"@things-factory/integration-sftp": "^4.3.301",
|
|
33
33
|
"@things-factory/notification": "^4.3.281",
|
|
34
34
|
"@things-factory/product-base": "^4.3.301",
|
|
35
35
|
"@things-factory/setting-base": "^4.3.281",
|
|
36
36
|
"@things-factory/shell": "^4.3.281",
|
|
37
37
|
"@things-factory/transport-base": "^4.3.301",
|
|
38
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
38
|
+
"@things-factory/warehouse-base": "^4.3.304"
|
|
39
39
|
},
|
|
40
|
-
"gitHead": "
|
|
40
|
+
"gitHead": "756ea978b9d0f334124e2bd74d65aa32fc0ec5b7"
|
|
41
41
|
}
|
|
@@ -144,7 +144,8 @@ export class PowrupController {
|
|
|
144
144
|
let releaseGoodRepo = trxMgr ? trxMgr.getRepository(ReleaseGood) : getRepository(ReleaseGood)
|
|
145
145
|
|
|
146
146
|
let orderPackages: OrderPackage[] = await orderPackageRepo.find({
|
|
147
|
-
where: { releaseGood, bizplace: releaseGood.bizplace }
|
|
147
|
+
where: { releaseGood, bizplace: releaseGood.bizplace },
|
|
148
|
+
relations: ['releaseGood', 'releaseGood.lastMileDelivery']
|
|
148
149
|
})
|
|
149
150
|
|
|
150
151
|
if (orderPackages?.length) {
|
|
@@ -153,23 +154,23 @@ export class PowrupController {
|
|
|
153
154
|
.filter(op => op?.marketRtsCallSuccess == undefined)
|
|
154
155
|
.map(async op => {
|
|
155
156
|
if (!op?.packageId) throw new Error('Order package id is not found')
|
|
156
|
-
if (
|
|
157
|
+
if (op.lmdOption && !op?.parcelId) return
|
|
157
158
|
|
|
158
159
|
let orderInformation: any = {
|
|
159
160
|
refOrderId: releaseGood.refOrderId,
|
|
160
161
|
packageId: op.packageId
|
|
161
162
|
}
|
|
162
|
-
if (releaseGood
|
|
163
|
-
let releaseGoodQuery: ReleaseGood = await releaseGoodRepo.findOne({
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
})
|
|
163
|
+
if (op?.releaseGood?.lmdOption) {
|
|
164
|
+
// let releaseGoodQuery: ReleaseGood = await releaseGoodRepo.findOne({
|
|
165
|
+
// where: { id: releaseGood.id },
|
|
166
|
+
// relations: ['lastMileDelivery']
|
|
167
|
+
// })
|
|
167
168
|
orderInformation = {
|
|
168
169
|
...orderInformation,
|
|
169
170
|
awb: op.airwayBill,
|
|
170
171
|
trackingNo: op.trackingNo,
|
|
171
|
-
lmdOption: releaseGood
|
|
172
|
-
shipperName:
|
|
172
|
+
lmdOption: op?.releaseGood?.lmdOption,
|
|
173
|
+
shipperName: op.releaseGood.lastMileDelivery.platform
|
|
173
174
|
}
|
|
174
175
|
}
|
|
175
176
|
|
|
@@ -203,7 +204,7 @@ export class PowrupController {
|
|
|
203
204
|
user?: User,
|
|
204
205
|
trxMgr?: EntityManager
|
|
205
206
|
): Promise<ReleaseGood> {
|
|
206
|
-
if (releaseGood?.
|
|
207
|
+
if (releaseGood?.lmdOption) {
|
|
207
208
|
return
|
|
208
209
|
}
|
|
209
210
|
try {
|
|
@@ -15,6 +15,7 @@ import { User } from '@things-factory/auth-base'
|
|
|
15
15
|
import { Bizplace } from '@things-factory/biz-base'
|
|
16
16
|
import { config } from '@things-factory/env'
|
|
17
17
|
import { Domain } from '@things-factory/shell'
|
|
18
|
+
import { LastMileDelivery } from '@things-factory/integration-lmd'
|
|
18
19
|
|
|
19
20
|
import { Manifest, OrderPackageItem, ReleaseGood } from '../'
|
|
20
21
|
import { DispatchmentStatus } from '../release-good/release-good'
|
|
@@ -102,6 +103,17 @@ export class OrderPackage {
|
|
|
102
103
|
@Field({ nullable: true })
|
|
103
104
|
parcelId: string
|
|
104
105
|
|
|
106
|
+
@Column({ nullable: true })
|
|
107
|
+
@Field({ nullable: true })
|
|
108
|
+
lmdOption: boolean
|
|
109
|
+
|
|
110
|
+
@ManyToOne(type => LastMileDelivery)
|
|
111
|
+
@Field(type => LastMileDelivery, { nullable: true })
|
|
112
|
+
lastMileDelivery: LastMileDelivery
|
|
113
|
+
|
|
114
|
+
@RelationId((orderPackage: OrderPackage) => orderPackage.lastMileDelivery)
|
|
115
|
+
lastMileDeliveryId?: string
|
|
116
|
+
|
|
105
117
|
@Column({
|
|
106
118
|
type:
|
|
107
119
|
DATABASE_TYPE == 'postgres' || DATABASE_TYPE == 'mysql' || DATABASE_TYPE == 'mariadb'
|