@hugo.ye/common 1.0.98 → 1.0.100
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 都由三段字符组成
|
|
@@ -8,5 +10,19 @@ export declare function getRandomInt(min: number, max: number): number;
|
|
|
8
10
|
* @param dynamicAction 动态action, 如PT_ANN_Y1 第 1 年年费，PT_ANN_Y[N] 第 N 年年费
|
|
9
11
|
* @returns
|
|
10
12
|
*/
|
|
11
|
-
export declare const getOrderNumber: (category
|
|
13
|
+
export declare const getOrderNumber: ({ category, action, country, target, dynamicAction, }: {
|
|
14
|
+
category: "TM" | "PT" | "PCT";
|
|
15
|
+
action?: "NEW" | "CLM" | "PGE" | "SUB" | "PUB" | "REG" | "ANN" | "FIG" | "MUL" | "LATE";
|
|
16
|
+
country: string;
|
|
17
|
+
target?: "INV" | "UM" | "DES" | "NP";
|
|
18
|
+
dynamicAction?: string;
|
|
19
|
+
}) => string;
|
|
20
|
+
interface CalculateServiceFeeType {
|
|
21
|
+
totalAmount: number;
|
|
22
|
+
officialFee: number;
|
|
23
|
+
localAttorneyFee: number;
|
|
24
|
+
serviceFee: number;
|
|
25
|
+
}
|
|
26
|
+
export declare const calculateServiceFee: (serviceFee: ServiceFeeEntity, localAttorneyFeeTire: LocalAttorneyFeeTireType, quantity: number) => CalculateServiceFeeType;
|
|
27
|
+
export {};
|
|
12
28
|
//# 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,
|
|
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,GAAI,uDAM5B;IACD,QAAQ,EAAE,IAAI,GAAG,IAAI,GAAG,KAAK,CAAC;IAC9B,MAAM,CAAC,EACH,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,KAAK,GACL,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,KAAK,GAAG,IAAI,GAAG,KAAK,GAAG,IAAI,CAAC;IACrC,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB,WAkBA,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
|
@@ -10,13 +10,12 @@ export function getRandomInt(min, max) {
|
|
|
10
10
|
* @param dynamicAction 动态action, 如PT_ANN_Y1 第 1 年年费，PT_ANN_Y[N] 第 N 年年费
|
|
11
11
|
* @returns
|
|
12
12
|
*/
|
|
13
|
-
export const getOrderNumber = (category, action, country, target, dynamicAction) => {
|
|
13
|
+
export const getOrderNumber = ({ category, action, country, target, dynamicAction, }) => {
|
|
14
14
|
const date = new Date();
|
|
15
15
|
const prefix = category +
|
|
16
16
|
'_' +
|
|
17
17
|
(target ? target + '_' : '') +
|
|
18
|
-
(dynamicAction ? dynamicAction : action) +
|
|
19
|
-
'_' +
|
|
18
|
+
(dynamicAction ? dynamicAction + '_' : action ? action + '_' : '') +
|
|
20
19
|
country.toLocaleUpperCase() +
|
|
21
20
|
'_' +
|
|
22
21
|
date.getFullYear().toString() +
|
|
@@ -29,4 +28,45 @@ export const getOrderNumber = (category, action, country, target, dynamicAction)
|
|
|
29
28
|
const suffix = getRandomInt(100000, 999999).toString();
|
|
30
29
|
return prefix + suffix;
|
|
31
30
|
};
|
|
31
|
+
export const calculateServiceFee = (serviceFee, localAttorneyFeeTire, quantity) => {
|
|
32
|
+
// 1（固定金额）2（递增固定金额，如每件增加50元）3（倍增，即乘以件数）
|
|
33
|
+
const officialFee = Number(serviceFee.officialFee);
|
|
34
|
+
const inipaFee = Number(serviceFee.inipaFee);
|
|
35
|
+
const attorneyDirectFilingFee = Number(serviceFee.attorneyDirectFilingFee);
|
|
36
|
+
const attorneyOptimalFee = Number(serviceFee.attorneyOptimalFee);
|
|
37
|
+
const attorneyStandardServiceFee = Number(serviceFee.attorneyStandardServiceFee);
|
|
38
|
+
const incrementOfficalFee = Number(serviceFee.incrementOfficalFee);
|
|
39
|
+
const incrementAttorneyFee = Number(serviceFee.incrementAttorneyFee);
|
|
40
|
+
const localAttorneyFee = localAttorneyFeeTire === 'Direct Filing'
|
|
41
|
+
? attorneyDirectFilingFee
|
|
42
|
+
: localAttorneyFeeTire === 'Optimal Bid'
|
|
43
|
+
? attorneyOptimalFee
|
|
44
|
+
: attorneyStandardServiceFee;
|
|
45
|
+
const totalAmount = localAttorneyFee + officialFee;
|
|
46
|
+
switch (serviceFee.calculationMethod) {
|
|
47
|
+
case 1:
|
|
48
|
+
return {
|
|
49
|
+
totalAmount: totalAmount + inipaFee,
|
|
50
|
+
officialFee: officialFee,
|
|
51
|
+
localAttorneyFee: localAttorneyFee,
|
|
52
|
+
serviceFee: inipaFee,
|
|
53
|
+
};
|
|
54
|
+
case 2:
|
|
55
|
+
return {
|
|
56
|
+
totalAmount: totalAmount +
|
|
57
|
+
inipaFee +
|
|
58
|
+
(quantity - 1) * (incrementOfficalFee + incrementAttorneyFee),
|
|
59
|
+
officialFee: officialFee + (quantity - 1) * incrementOfficalFee,
|
|
60
|
+
localAttorneyFee: localAttorneyFee + (quantity - 1) * serviceFee.incrementAttorneyFee,
|
|
61
|
+
serviceFee: inipaFee,
|
|
62
|
+
};
|
|
63
|
+
default:
|
|
64
|
+
return {
|
|
65
|
+
totalAmount: totalAmount * quantity + inipaFee,
|
|
66
|
+
officialFee: officialFee * quantity,
|
|
67
|
+
localAttorneyFee: localAttorneyFee * quantity,
|
|
68
|
+
serviceFee: inipaFee,
|
|
69
|
+
};
|
|
70
|
+
}
|
|
71
|
+
};
|
|
32
72
|
//# 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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"}
|