Merge branch 'master' of http://gitlab.fjmaimaimai.com/allied-creation/document
正在显示
74 个修改的文件
包含
753 行增加
和
10 行删除
@@ -19,6 +19,9 @@ metadata: | @@ -19,6 +19,9 @@ metadata: | ||
19 | - method: searchCooperationContract | 19 | - method: searchCooperationContract |
20 | route: | 20 | route: |
21 | post: /search | 21 | post: /search |
22 | + - method: searchCooperationContractByUndertaker | ||
23 | + route: | ||
24 | + post: /search-by-undertaker | ||
22 | - method: listCooperationContract | 25 | - method: listCooperationContract |
23 | route: | 26 | route: |
24 | get: / | 27 | get: / |
1 | +version: v1 | ||
2 | +kind: HttpApi | ||
3 | +metadata: | ||
4 | + service: creditAccount | ||
5 | + path: /credit-accounts | ||
6 | + endpoints: | ||
7 | + - method: createCreditAccount | ||
8 | + route: | ||
9 | + post: / | ||
10 | + - method: updateCreditAccount | ||
11 | + route: | ||
12 | + put: /{creditAccountId} | ||
13 | + - method: getCreditAccount | ||
14 | + route: | ||
15 | + get: /{creditAccountId} | ||
16 | + - method: removeCreditAccount | ||
17 | + route: | ||
18 | + delete: /{creditAccountId} | ||
19 | + - method: searchCreditAccount | ||
20 | + route: | ||
21 | + post: /search | ||
22 | + - method: payCreditAccount | ||
23 | + route: | ||
24 | + post: /pay | ||
25 | + - method: listCreditAccount | ||
26 | + route: | ||
27 | + get: / | ||
28 | + params: | ||
29 | + - name: offset | ||
30 | + - name: limit |
1 | +version: v1 | ||
2 | +kind: HttpApi | ||
3 | +metadata: | ||
4 | + service: dividendsEstimate | ||
5 | + path: /dividends-estimates | ||
6 | + endpoints: | ||
7 | + - method: createDividendsEstimate | ||
8 | + route: | ||
9 | + post: / | ||
10 | + - method: updateDividendsEstimate | ||
11 | + route: | ||
12 | + put: /{dividendsEstimateId} | ||
13 | + - method: getDividendsEstimate | ||
14 | + route: | ||
15 | + get: /{dividendsEstimateId} | ||
16 | + - method: removeDividendsEstimate | ||
17 | + route: | ||
18 | + delete: /{dividendsEstimateId} | ||
19 | + - method: cancelDividendsEstimate | ||
20 | + route: | ||
21 | + post: /{dividendsEstimateId}/cancel | ||
22 | + - method: searchDividendsEstimate | ||
23 | + route: | ||
24 | + post: /search | ||
25 | + - method: estimateDividendsIncentives | ||
26 | + route: | ||
27 | + post: /estimate-dividends-incentives | ||
28 | + - method: estimateMoneyIncentives | ||
29 | + route: | ||
30 | + post: /estimate-money-incentives | ||
31 | + - method: listMoneyIncentives | ||
32 | + route: | ||
33 | + get: /list-money-incentives | ||
34 | + - method: searchMoneyIncentives | ||
35 | + route: | ||
36 | + post: /search-money-incentives | ||
37 | + - method: listDividendsIncentives | ||
38 | + route: | ||
39 | + get: /list-dividends-incentives | ||
40 | + - method: searchDividendsIncentives | ||
41 | + route: | ||
42 | + post: /search-dividends-incentives | ||
43 | + - method: listDividendsEstimate | ||
44 | + route: | ||
45 | + get: / | ||
46 | + params: | ||
47 | + - name: offset | ||
48 | + - name: limit |
@@ -17,6 +17,7 @@ metadata: | @@ -17,6 +17,7 @@ metadata: | ||
17 | - ref: cooperationMode | 17 | - ref: cooperationMode |
18 | required: true | 18 | required: true |
19 | - ref: organization | 19 | - ref: organization |
20 | + description: 数据关联组织机构 | ||
20 | required: true | 21 | required: true |
21 | - ref: updatedAt | 22 | - ref: updatedAt |
22 | required: true | 23 | required: true |
@@ -25,6 +25,7 @@ metadata: | @@ -25,6 +25,7 @@ metadata: | ||
25 | - ref: cooperationProjectNumber | 25 | - ref: cooperationProjectNumber |
26 | required: true | 26 | required: true |
27 | - ref: organization | 27 | - ref: organization |
28 | + description: 数据关联组织机构 | ||
28 | required: true | 29 | required: true |
29 | - ref: createdAt | 30 | - ref: createdAt |
30 | required: true | 31 | required: true |
@@ -22,6 +22,16 @@ metadata: | @@ -22,6 +22,16 @@ metadata: | ||
22 | required: true | 22 | required: true |
23 | - ref: cooperationMode | 23 | - ref: cooperationMode |
24 | required: true | 24 | required: true |
25 | + - ref: status | ||
26 | + description: 合约状态,1启用,2禁用 | ||
27 | + required: true | ||
28 | + - ref: organization | ||
29 | + description: 数据关联组织机构 | ||
30 | + required: true | ||
31 | + - ref: operator | ||
32 | + required: true | ||
33 | + - ref: operateTime | ||
34 | + required: true | ||
25 | - ref: createdAt | 35 | - ref: createdAt |
26 | required: true | 36 | required: true |
27 | - ref: deletedAt | 37 | - ref: deletedAt |
@@ -15,6 +15,9 @@ metadata: | @@ -15,6 +15,9 @@ metadata: | ||
15 | - ref: status | 15 | - ref: status |
16 | description: 共创模式状态,1启用,2禁用 | 16 | description: 共创模式状态,1启用,2禁用 |
17 | required: true | 17 | required: true |
18 | + - ref: organization | ||
19 | + description: 数据关联组织机构 | ||
20 | + required: true | ||
18 | - ref: remarks | 21 | - ref: remarks |
19 | required: true | 22 | required: true |
20 | - ref: operator | 23 | - ref: operator |
@@ -21,6 +21,9 @@ metadata: | @@ -21,6 +21,9 @@ metadata: | ||
21 | required: true | 21 | required: true |
22 | - ref: cooperationProjectUndertakerType | 22 | - ref: cooperationProjectUndertakerType |
23 | required: true | 23 | required: true |
24 | + - ref: organization | ||
25 | + description: 数据关联组织机构 | ||
26 | + required: true | ||
24 | - ref: operator | 27 | - ref: operator |
25 | required: true | 28 | required: true |
26 | - ref: operateTime | 29 | - ref: operateTime |
1 | +version: v1 | ||
2 | +kind: Schema | ||
3 | +metadata: | ||
4 | + name: creditAccount | ||
5 | + description: 账期结算单实体 | ||
6 | + attributes: | ||
7 | + - ref: creditAccountId | ||
8 | + required: true | ||
9 | + - ref: actuallyPaidAmount | ||
10 | + required: true | ||
11 | + - ref: creditAccountOrderNum | ||
12 | + required: true | ||
13 | + - ref: paymentStatus | ||
14 | + description: 账期结算支付状态,1待支付,2已支付 | ||
15 | + required: true | ||
16 | + - ref: paymentTime | ||
17 | + required: true | ||
18 | + - ref: settlementAmount | ||
19 | + required: true | ||
20 | + - ref: settlementTime | ||
21 | + required: true | ||
22 | + - ref: cooperationContractNumber | ||
23 | + required: true | ||
24 | + - name: participator | ||
25 | + description: 参与人uid,包括承接人、推荐人、关联业务员 | ||
26 | + required: true | ||
27 | + type: | ||
28 | + array: int64 | ||
29 | + - ref: paymentDocumentAttachment | ||
30 | + description: 支付凭证附件 | ||
31 | + required: true | ||
32 | + - ref: organization | ||
33 | + description: 数据关联组织机构 | ||
34 | + required: true | ||
35 | + - ref: operator | ||
36 | + required: true | ||
37 | + - ref: operateTime | ||
38 | + required: true | ||
39 | + - ref: createdAt | ||
40 | + required: true | ||
41 | + - ref: deletedAt | ||
42 | + required: true | ||
43 | + - ref: updatedAt | ||
44 | + required: true |
1 | +version: v1 | ||
2 | +kind: Schema | ||
3 | +metadata: | ||
4 | + name: dividendsEstimate | ||
5 | + description: 分红预算实体 | ||
6 | + attributes: | ||
7 | + - ref: dividendsEstimateId | ||
8 | + required: true | ||
9 | + - ref: dividendsAccountStatus | ||
10 | + description: 分红结算状态 | ||
11 | + required: true | ||
12 | + - ref: dividendsAmount | ||
13 | + required: true | ||
14 | + - ref: dividendsEstimateOrderNumber | ||
15 | + required: true | ||
16 | + - ref: dividendsEstimateTime | ||
17 | + required: true | ||
18 | + - ref: dividendsParticipateType | ||
19 | + required: true | ||
20 | + - ref: dividendsType | ||
21 | + required: true | ||
22 | + - ref: orderOrReturnedOrderNum | ||
23 | + required: true | ||
24 | + - ref: cooperationProjectNumber | ||
25 | + required: true | ||
26 | + - ref: dividendsUser | ||
27 | + required: true | ||
28 | + - ref: organization | ||
29 | + description: 数据关联组织机构 | ||
30 | + required: true | ||
31 | + - ref: operator | ||
32 | + required: true | ||
33 | + - ref: operateTime | ||
34 | + required: true | ||
35 | + - ref: createdAt | ||
36 | + required: true | ||
37 | + - ref: deletedAt | ||
38 | + required: true | ||
39 | + - ref: updatedAt | ||
40 | + required: true |
1 | +version: v1 | ||
2 | +kind: Schema | ||
3 | +metadata: | ||
4 | + name: dividendsIncentives | ||
5 | + description: 业绩分红DTO | ||
6 | + attributes: | ||
7 | + - ref: cooperationContractNumber | ||
8 | + required: true | ||
9 | + - ref: orderOrReturnedOrderNum | ||
10 | + required: true | ||
11 | + - ref: originalOrderNum | ||
12 | + required: true | ||
13 | + - ref: customerName | ||
14 | + required: true | ||
15 | + - ref: region | ||
16 | + required: true | ||
17 | + - ref: dividendsIncentivesAmount | ||
18 | + required: true | ||
19 | + - ref: orderTime | ||
20 | + description: 订单/退货单日期 | ||
21 | + required: true |
@@ -21,6 +21,9 @@ metadata: | @@ -21,6 +21,9 @@ metadata: | ||
21 | required: true | 21 | required: true |
22 | - ref: dividendsIncentivesStageStart | 22 | - ref: dividendsIncentivesStageStart |
23 | required: true | 23 | required: true |
24 | + - ref: organization | ||
25 | + description: 数据关联组织机构 | ||
26 | + required: true | ||
24 | - ref: updatedAt | 27 | - ref: updatedAt |
25 | required: true | 28 | required: true |
26 | - ref: deletedAt | 29 | - ref: deletedAt |
@@ -2,7 +2,7 @@ version: v1 | @@ -2,7 +2,7 @@ version: v1 | ||
2 | kind: Schema | 2 | kind: Schema |
3 | metadata: | 3 | metadata: |
4 | name: dividendsIncentivesRule | 4 | name: dividendsIncentivesRule |
5 | - description: 金额激励规则实体 | 5 | + description: 金额激励规则DTO |
6 | attributes: | 6 | attributes: |
7 | - ref: referrerPercentage | 7 | - ref: referrerPercentage |
8 | required: true | 8 | required: true |
@@ -25,6 +25,9 @@ metadata: | @@ -25,6 +25,9 @@ metadata: | ||
25 | - ref: customerName | 25 | - ref: customerName |
26 | description: 客户姓名 | 26 | description: 客户姓名 |
27 | required: true | 27 | required: true |
28 | + - ref: organization | ||
29 | + description: 数据关联组织机构 | ||
30 | + required: true | ||
28 | - ref: createdAt | 31 | - ref: createdAt |
29 | required: true | 32 | required: true |
30 | - ref: deletedAt | 33 | - ref: deletedAt |
@@ -33,6 +33,7 @@ metadata: | @@ -33,6 +33,7 @@ metadata: | ||
33 | - ref: dividendTime | 33 | - ref: dividendTime |
34 | required: true | 34 | required: true |
35 | - ref: organization | 35 | - ref: organization |
36 | + description: 数据关联组织机构 | ||
36 | required: true | 37 | required: true |
37 | - ref: createdAt | 38 | - ref: createdAt |
38 | required: true | 39 | required: true |
1 | +version: v1 | ||
2 | +kind: Schema | ||
3 | +metadata: | ||
4 | + name: moneyIncentives | ||
5 | + description: 金额激励分红DTO | ||
6 | + attributes: | ||
7 | + - ref: cooperationContractNumber | ||
8 | + required: true | ||
9 | + - ref: cooperationContractName | ||
10 | + required: true | ||
11 | + - ref: cooperationMode | ||
12 | + required: true | ||
13 | + - ref: cooperationContractSponsor | ||
14 | + requried: true | ||
15 | + - ref: createdAt | ||
16 | + description: 共创合约建立时间 | ||
17 | + required: true |
@@ -23,6 +23,9 @@ metadata: | @@ -23,6 +23,9 @@ metadata: | ||
23 | required: true | 23 | required: true |
24 | - ref: salesmanPercentage | 24 | - ref: salesmanPercentage |
25 | required: true | 25 | required: true |
26 | + - ref: organization | ||
27 | + description: 数据关联组织机构 | ||
28 | + required: true | ||
26 | - ref: updatedAt | 29 | - ref: updatedAt |
27 | required: true | 30 | required: true |
28 | - ref: deletedAt | 31 | - ref: deletedAt |
@@ -2,7 +2,7 @@ version: v1 | @@ -2,7 +2,7 @@ version: v1 | ||
2 | kind: Schema | 2 | kind: Schema |
3 | metadata: | 3 | metadata: |
4 | name: moneyIncentivesRule | 4 | name: moneyIncentivesRule |
5 | - description: 金额激励规则实体 | 5 | + description: 金额激励规则DTO |
6 | attributes: | 6 | attributes: |
7 | - ref: moneyIncentivesAmount | 7 | - ref: moneyIncentivesAmount |
8 | required: true | 8 | required: true |
@@ -6,7 +6,10 @@ metadata: | @@ -6,7 +6,10 @@ metadata: | ||
6 | attributes: | 6 | attributes: |
7 | - ref: userId | 7 | - ref: userId |
8 | required: true | 8 | required: true |
9 | - - ref: orgnization | 9 | + - ref: usersBaseId |
10 | + required: true | ||
11 | + - ref: organization | ||
12 | + description: 用户关联组织机构 | ||
10 | required: true | 13 | required: true |
11 | - ref: role | 14 | - ref: role |
12 | required: true | 15 | required: true |
@@ -6,7 +6,10 @@ metadata: | @@ -6,7 +6,10 @@ metadata: | ||
6 | attributes: | 6 | attributes: |
7 | - ref: userId | 7 | - ref: userId |
8 | required: true | 8 | required: true |
9 | - - ref: orgnization | 9 | + - ref: usersBaseId |
10 | + required: true | ||
11 | + - ref: organization | ||
12 | + description: 用户关联组织机构 | ||
10 | required: true | 13 | required: true |
11 | - ref: role | 14 | - ref: role |
12 | required: true | 15 | required: true |
@@ -17,4 +20,5 @@ metadata: | @@ -17,4 +20,5 @@ metadata: | ||
17 | - ref: status | 20 | - ref: status |
18 | required: true | 21 | required: true |
19 | - ref: company | 22 | - ref: company |
23 | + description: 用户关联公司信息 | ||
20 | required: true | 24 | required: true |
1 | +version: v1 | ||
2 | +kind: Method | ||
3 | +metadata: | ||
4 | + name: searchCooperationContractByUndertaker | ||
5 | + type: query | ||
6 | + description: 根据承接人返回共创项目合约 | ||
7 | + payload: | ||
8 | + - ref: cooperationContractName | ||
9 | + requird: false | ||
10 | + - name: sponsorName | ||
11 | + description: 项目发起人姓名 | ||
12 | + type: | ||
13 | + primitive: string | ||
14 | + required: false | ||
15 | + result: | ||
16 | + - ref: cooperationContractDescription | ||
17 | + required: true | ||
18 | + - ref: cooperationContractId | ||
19 | + required: true | ||
20 | + - ref: contractUndertaker | ||
21 | + required: true | ||
22 | + - ref: cooperationContractNumber | ||
23 | + required: true | ||
24 | + - ref: cooperationContractName | ||
25 | + required: true | ||
26 | + - ref: cooperationMode | ||
27 | + required: true | ||
28 | + - ref: cooperationContractSponsor | ||
29 | + required: true | ||
30 | + - ref: status | ||
31 | + required: true |
1 | +version: v1 | ||
2 | +kind: Method | ||
3 | +metadata: | ||
4 | + name: listCreditAccount | ||
5 | + type: query | ||
6 | + description: 返回账期结算单服务列表 | ||
7 | + payload: | ||
8 | + - ref: offset | ||
9 | + required: true | ||
10 | + - ref: limit | ||
11 | + required: true | ||
12 | + result: | ||
13 | + - ref: count | ||
14 | + required: true | ||
15 | + - name: creditAccounts | ||
16 | + type: | ||
17 | + array: creditAccount | ||
18 | + required: true |
1 | +version: v1 | ||
2 | +kind: Method | ||
3 | +metadata: | ||
4 | + name: payCreditAccount | ||
5 | + type: command | ||
6 | + description: 支付账期结算 | ||
7 | + payload: | ||
8 | + - ref: actuallyPaidAmount | ||
9 | + required: true | ||
10 | + - ref: remarks | ||
11 | + required: true | ||
12 | + result: | ||
13 | + - name: creditAccount | ||
14 | + type: | ||
15 | + schema: creditAccount | ||
16 | + required: true |
1 | +version: v1 | ||
2 | +kind: Method | ||
3 | +metadata: | ||
4 | + name: searchCreditAccount | ||
5 | + type: query | ||
6 | + description: 查询账期结算单 | ||
7 | + payload: | ||
8 | + - ref: creditAccountOrderNum | ||
9 | + required: true | ||
10 | + - name: participartorName | ||
11 | + description: 参与人姓名 | ||
12 | + type: | ||
13 | + primitive: string | ||
14 | + result: | ||
15 | + - name: creditAccount | ||
16 | + type: | ||
17 | + schema: creditAccount | ||
18 | + required: true |
allied-creation-cooperation/services/dividendsEstimate/methods/estimateDividendsIncentives.yaml
0 → 100644
1 | +version: v1 | ||
2 | +kind: Method | ||
3 | +metadata: | ||
4 | + name: estimateDividendsIncentives | ||
5 | + type: command | ||
6 | + description: 确定预算分红激励 | ||
7 | + payload: | ||
8 | + - ref: orderOrReturnedOrderNum | ||
9 | + description: 分红订单号/退货单号 | ||
10 | + required: true | ||
11 | + - ref: cooperationContractNumber | ||
12 | + description: 合约编号 | ||
13 | + required: true | ||
14 | + result: | ||
15 | + - name: dividendsEstimate | ||
16 | + type: | ||
17 | + schema: dividendsEstimate | ||
18 | + required: true |
allied-creation-cooperation/services/dividendsEstimate/methods/estimateMoneyIncentives.yaml
0 → 100644
1 | +version: v1 | ||
2 | +kind: Method | ||
3 | +metadata: | ||
4 | + name: estimateMoneyIncentives | ||
5 | + type: command | ||
6 | + description: 确定预算金额激励分红 | ||
7 | + payload: | ||
8 | + - ref: cooperationContractNumber | ||
9 | + description: 共创项目合约编号 | ||
10 | + required: true | ||
11 | + - ref: dividendsIncentivesStage | ||
12 | + description: 分红阶段 | ||
13 | + required: true | ||
14 | + - name: undertakerUid | ||
15 | + decription: 承接人UID | ||
16 | + type: | ||
17 | + primitive: string | ||
18 | + required: true | ||
19 | + result: | ||
20 | + - name: dividendsEstimate | ||
21 | + type: | ||
22 | + schema: dividendsEstimate | ||
23 | + required: true |
allied-creation-cooperation/services/dividendsEstimate/methods/listDividendsEstimate.yaml
0 → 100644
1 | +version: v1 | ||
2 | +kind: Method | ||
3 | +metadata: | ||
4 | + name: listDividendsEstimate | ||
5 | + type: query | ||
6 | + description: 返回分红预算服务列表 | ||
7 | + payload: | ||
8 | + - ref: offset | ||
9 | + required: true | ||
10 | + - ref: limit | ||
11 | + required: true | ||
12 | + result: | ||
13 | + - ref: count | ||
14 | + required: true | ||
15 | + - name: dividendsEstimates | ||
16 | + type: | ||
17 | + array: dividendsEstimate | ||
18 | + required: true |
allied-creation-cooperation/services/dividendsEstimate/methods/listDividendsIncentives.yaml
0 → 100644
1 | +version: v1 | ||
2 | +kind: Method | ||
3 | +metadata: | ||
4 | + name: listDividendsIncentives | ||
5 | + type: query | ||
6 | + description: 返回业绩激励分红 | ||
7 | + payload: | ||
8 | + - ref: offset | ||
9 | + required: true | ||
10 | + - ref: limit | ||
11 | + required: true | ||
12 | + result: | ||
13 | + - name: dividendsIncentives | ||
14 | + type: | ||
15 | + schema: dividendsIncentives | ||
16 | + required: true |
1 | +version: v1 | ||
2 | +kind: Method | ||
3 | +metadata: | ||
4 | + name: listMoneyIncentives | ||
5 | + type: query | ||
6 | + description: 返回金额激励分红 | ||
7 | + payload: | ||
8 | + - ref: offset | ||
9 | + required: true | ||
10 | + - ref: limit | ||
11 | + required: true | ||
12 | + result: | ||
13 | + - name: moneyIncentives | ||
14 | + type: | ||
15 | + schema: moneyIncentives | ||
16 | + required: true |
allied-creation-cooperation/services/dividendsEstimate/methods/searchDividendsEstimate.yaml
0 → 100644
1 | +version: v1 | ||
2 | +kind: Method | ||
3 | +metadata: | ||
4 | + name: searchDividendsEstimate | ||
5 | + type: query | ||
6 | + description: 查询分红预算单 | ||
7 | + payload: | ||
8 | + - ref: dividendsEstimateOrderNumber | ||
9 | + required: true | ||
10 | + - ref: dividendsType | ||
11 | + required: true | ||
12 | + result: | ||
13 | + - name: dividendsEstimate | ||
14 | + type: | ||
15 | + schema: dividendsEstimate | ||
16 | + required: true |
allied-creation-cooperation/services/dividendsEstimate/methods/searchDividendsIncentives.yaml
0 → 100644
1 | +version: v1 | ||
2 | +kind: Method | ||
3 | +metadata: | ||
4 | + name: searchDividendsIncentives | ||
5 | + type: query | ||
6 | + description: 查询业绩分红 | ||
7 | + payload: | ||
8 | + - ref: cooperationContractNumber | ||
9 | + description: 合约编号 | ||
10 | + required: false | ||
11 | + - ref: orderOrReturnedOrderNum | ||
12 | + description: 分红订单号/退货单号 | ||
13 | + required: false | ||
14 | + result: | ||
15 | + - name: dividendsIncentives | ||
16 | + type: | ||
17 | + schema: dividendsIncentives | ||
18 | + required: true |
allied-creation-cooperation/services/dividendsEstimate/methods/searchMoneyIncentives.yaml
0 → 100644
1 | +version: v1 | ||
2 | +kind: Method | ||
3 | +metadata: | ||
4 | + name: searchMoneyIncentives | ||
5 | + type: query | ||
6 | + description: 查询金额激励分红 | ||
7 | + payload: | ||
8 | + - ref: cooperationContractName | ||
9 | + description: 共创合约名称 | ||
10 | + required: false | ||
11 | + - ref: departmentName | ||
12 | + description: 发起部门名称 | ||
13 | + required: false | ||
14 | + result: | ||
15 | + - name: moneyIncentives | ||
16 | + type: | ||
17 | + schema: moneyIncentives | ||
18 | + required: true |
@@ -4,6 +4,9 @@ metadata: | @@ -4,6 +4,9 @@ metadata: | ||
4 | name: getDividendsReturnedOrder | 4 | name: getDividendsReturnedOrder |
5 | type: query | 5 | type: query |
6 | description: 返回分红退货单服务 | 6 | description: 返回分红退货单服务 |
7 | + payload: | ||
8 | + - ref: dividendsReturnedOrderId | ||
9 | + require: true | ||
7 | result: | 10 | result: |
8 | - name: dividendsReturnedOrders | 11 | - name: dividendsReturnedOrders |
9 | type: | 12 | type: |
@@ -5,7 +5,7 @@ metadata: | @@ -5,7 +5,7 @@ metadata: | ||
5 | type: query | 5 | type: query |
6 | description: 返回项目金额激励规则服务 | 6 | description: 返回项目金额激励规则服务 |
7 | payload: | 7 | payload: |
8 | - - ref: moneyIncentivesRulesId | 8 | + - ref: moneyIncentivesRuleId |
9 | required: true | 9 | required: true |
10 | result: | 10 | result: |
11 | - name: moneyIncentivesRule | 11 | - name: moneyIncentivesRule |
@@ -2,6 +2,6 @@ version: v1 | @@ -2,6 +2,6 @@ version: v1 | ||
2 | kind: Attribute | 2 | kind: Attribute |
3 | metadata: | 3 | metadata: |
4 | name: isPublish | 4 | name: isPublish |
5 | - description: 菜单是否公开状态(上架、下架),[0:隐藏],[1:显示],默认显示 | 5 | + description: 菜单是否公开状态(上架、下架),[2:隐藏],[1:显示],默认显示 |
6 | type: | 6 | type: |
7 | primitive: int | 7 | primitive: int |
@@ -22,6 +22,10 @@ metadata: | @@ -22,6 +22,10 @@ metadata: | ||
22 | description: 所属部门 | 22 | description: 所属部门 |
23 | type: | 23 | type: |
24 | primitive: int64 | 24 | primitive: int64 |
25 | + - name: usersInfo | ||
26 | + description: 用户信息 (冗余,数据存在usersBase里面) | ||
27 | + type: | ||
28 | + array: usersInfo | ||
25 | - name: usersOrg | 29 | - name: usersOrg |
26 | description: 用户关联的组织 | 30 | description: 用户关联的组织 |
27 | type: | 31 | type: |
@@ -6,6 +6,8 @@ metadata: | @@ -6,6 +6,8 @@ metadata: | ||
6 | attributes: | 6 | attributes: |
7 | - ref: usersId | 7 | - ref: usersId |
8 | required: true | 8 | required: true |
9 | + - ref: usersBaseId | ||
10 | + required: true | ||
9 | - ref: usersName | 11 | - ref: usersName |
10 | required: true | 12 | required: true |
11 | - ref: usersCode | 13 | - ref: usersCode |
@@ -36,7 +36,11 @@ metadata: | @@ -36,7 +36,11 @@ metadata: | ||
36 | type: | 36 | type: |
37 | primitive: int | 37 | primitive: int |
38 | - ref: password | 38 | - ref: password |
39 | - required: true | 39 | + required: true |
40 | + - name: usersInfo | ||
41 | + description: 用户信息 | ||
42 | + type: | ||
43 | + array: usersInfo | ||
40 | result: | 44 | result: |
41 | - name: users | 45 | - name: users |
42 | type: | 46 | type: |
-
请 注册 或 登录 后发表评论