@hugo.ye/common 1.0.97 → 1.0.99
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.
|
@@ -8,7 +8,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
8
8
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
9
9
|
};
|
|
10
10
|
import { AbstractEntity } from '../index.js';
|
|
11
|
-
import { Directive, Field,
|
|
11
|
+
import { Directive, Field, ObjectType } from '@nestjs/graphql';
|
|
12
12
|
import { Column, Entity, JoinColumn, OneToOne } from 'typeorm';
|
|
13
13
|
import { OrderEntity } from './index.js';
|
|
14
14
|
import { Type } from 'class-transformer';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invention-patent.entity.js","sourceRoot":"","sources":["../../src/models/invention-patent.entity.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"invention-patent.entity.js","sourceRoot":"","sources":["../../src/models/invention-patent.entity.ts"],"names":[],"mappings":"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"}
|
package/build/utils/order.d.ts
CHANGED
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import type { LocalAttorneyFeeTireType } from '../index.js';
|
|
2
|
+
import type { ServiceFeeEntity } from '../models/index.js';
|
|
1
3
|
export declare function getRandomInt(min: number, max: number): number;
|
|
2
4
|
/**
|
|
3
5
|
* 每一个 SKU 都由三段字符组成
|
|
@@ -9,4 +11,12 @@ export declare function getRandomInt(min: number, max: number): number;
|
|
|
9
11
|
* @returns
|
|
10
12
|
*/
|
|
11
13
|
export declare const getOrderNumber: (category: "TM" | "PT" | "PCT", action: "NEW" | "CLM" | "PGE" | "SUB" | "PUB" | "REG" | "ANN" | "FIG" | "MUL" | "LATE", country: string, target?: "INV" | "UM" | "DES" | "NP", dynamicAction?: string) => string;
|
|
14
|
+
interface CalculateServiceFeeType {
|
|
15
|
+
totalAmount: number;
|
|
16
|
+
officialFee: number;
|
|
17
|
+
localAttorneyFee: number;
|
|
18
|
+
serviceFee: number;
|
|
19
|
+
}
|
|
20
|
+
export declare const calculateServiceFee: (serviceFee: ServiceFeeEntity, localAttorneyFeeTire: LocalAttorneyFeeTireType, quantity: number) => CalculateServiceFeeType;
|
|
21
|
+
export {};
|
|
12
22
|
//# sourceMappingURL=order.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order.d.ts","sourceRoot":"","sources":["../../src/utils/order.ts"],"names":[],"mappings":"AAAA,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,UAEpD;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,cAAc,GACzB,UAAU,IAAI,GAAG,IAAI,GAAG,KAAK,EAC7B,QACI,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,MAAM,EACV,SAAS,MAAM,EACf,SAAS,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,EACpC,gBAAgB,MAAM,WAoBvB,CAAC"}
|
|
1
|
+
{"version":3,"file":"order.d.ts","sourceRoot":"","sources":["../../src/utils/order.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,UAEpD;AAED;;;;;;;;GAQG;AACH,eAAO,MAAM,cAAc,GACzB,UAAU,IAAI,GAAG,IAAI,GAAG,KAAK,EAC7B,QACI,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,MAAM,EACV,SAAS,MAAM,EACf,SAAS,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,EACpC,gBAAgB,MAAM,WAoBvB,CAAC;AAEF,UAAU,uBAAuB;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;CACpB;AACD,eAAO,MAAM,mBAAmB,GAC9B,YAAY,gBAAgB,EAC5B,sBAAsB,wBAAwB,EAC9C,UAAU,MAAM,KACf,uBAgDF,CAAC"}
|
package/build/utils/order.js
CHANGED
|
@@ -14,7 +14,7 @@ export const getOrderNumber = (category, action, country, target, dynamicAction)
|
|
|
14
14
|
const date = new Date();
|
|
15
15
|
const prefix = category +
|
|
16
16
|
'_' +
|
|
17
|
-
(target ? '_'
|
|
17
|
+
(target ? target + '_' : '') +
|
|
18
18
|
(dynamicAction ? dynamicAction : action) +
|
|
19
19
|
'_' +
|
|
20
20
|
country.toLocaleUpperCase() +
|
|
@@ -29,4 +29,45 @@ export const getOrderNumber = (category, action, country, target, dynamicAction)
|
|
|
29
29
|
const suffix = getRandomInt(100000, 999999).toString();
|
|
30
30
|
return prefix + suffix;
|
|
31
31
|
};
|
|
32
|
+
export const calculateServiceFee = (serviceFee, localAttorneyFeeTire, quantity) => {
|
|
33
|
+
// 1（固定金额）2（递增固定金额，如每件增加50元）3（倍增，即乘以件数）
|
|
34
|
+
const officialFee = Number(serviceFee.officialFee);
|
|
35
|
+
const inipaFee = Number(serviceFee.inipaFee);
|
|
36
|
+
const attorneyDirectFilingFee = Number(serviceFee.attorneyDirectFilingFee);
|
|
37
|
+
const attorneyOptimalFee = Number(serviceFee.attorneyOptimalFee);
|
|
38
|
+
const attorneyStandardServiceFee = Number(serviceFee.attorneyStandardServiceFee);
|
|
39
|
+
const incrementOfficalFee = Number(serviceFee.incrementOfficalFee);
|
|
40
|
+
const incrementAttorneyFee = Number(serviceFee.incrementAttorneyFee);
|
|
41
|
+
const localAttorneyFee = localAttorneyFeeTire === 'Direct Filing'
|
|
42
|
+
? attorneyDirectFilingFee
|
|
43
|
+
: localAttorneyFeeTire === 'Optimal Bid'
|
|
44
|
+
? attorneyOptimalFee
|
|
45
|
+
: attorneyStandardServiceFee;
|
|
46
|
+
const totalAmount = localAttorneyFee + officialFee;
|
|
47
|
+
switch (serviceFee.calculationMethod) {
|
|
48
|
+
case 1:
|
|
49
|
+
return {
|
|
50
|
+
totalAmount: totalAmount + inipaFee,
|
|
51
|
+
officialFee: officialFee,
|
|
52
|
+
localAttorneyFee: localAttorneyFee,
|
|
53
|
+
serviceFee: inipaFee,
|
|
54
|
+
};
|
|
55
|
+
case 2:
|
|
56
|
+
return {
|
|
57
|
+
totalAmount: totalAmount +
|
|
58
|
+
inipaFee +
|
|
59
|
+
(quantity - 1) * (incrementOfficalFee + incrementAttorneyFee),
|
|
60
|
+
officialFee: officialFee + (quantity - 1) * incrementOfficalFee,
|
|
61
|
+
localAttorneyFee: localAttorneyFee + (quantity - 1) * serviceFee.incrementAttorneyFee,
|
|
62
|
+
serviceFee: inipaFee,
|
|
63
|
+
};
|
|
64
|
+
default:
|
|
65
|
+
return {
|
|
66
|
+
totalAmount: totalAmount * quantity + inipaFee,
|
|
67
|
+
officialFee: officialFee * quantity,
|
|
68
|
+
localAttorneyFee: localAttorneyFee * quantity,
|
|
69
|
+
serviceFee: inipaFee,
|
|
70
|
+
};
|
|
71
|
+
}
|
|
72
|
+
};
|
|
32
73
|
//# sourceMappingURL=order.js.map
|
package/build/utils/order.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"order.js","sourceRoot":"","sources":["../../src/utils/order.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"order.js","sourceRoot":"","sources":["../../src/utils/order.ts"],"names":[],"mappings":"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"}
|