allied-creation / allied-creation-gateway · 提交

转到一个项目

作者 yangfu
提交 3c6b1bfa84ad8c806e65a8c6350dd54a662c567b 2 个父辈 54160d27 c721a49f

Merge branch 'dev' of http://gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway into dev

内嵌 并排对比
正在显示 20 个修改的文件 包含 75 行增加 和 57 行删除
@@ -2,6 +2,7 @@ package command @@ -2,6 +2,7 @@ package command
2 2
3 import ( 3 import (
4 "fmt" 4 "fmt"
  5 +
5 "github.com/beego/beego/v2/core/validation" 6 "github.com/beego/beego/v2/core/validation"
6 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain" 7 "gitlab.fjmaimaimai.com/allied-creation/allied-creation-gateway/pkg/domain"
7 ) 8 )
@@ -15,7 +16,7 @@ type CreditAccountPayCommand struct { @@ -15,7 +16,7 @@ type CreditAccountPayCommand struct {
15 ActuallyPaidAmount float64 `cname:"账期结算实付金额" json:"actuallyPaidAmount" valid:"Required"` 16 ActuallyPaidAmount float64 `cname:"账期结算实付金额" json:"actuallyPaidAmount" valid:"Required"`
16 // 备注 17 // 备注
17 Remarks string `cname:"备注" json:"remark"` 18 Remarks string `cname:"备注" json:"remark"`
18 - Attachment domain.Attachment `json:"paymentDocumentAttachment"` //附件 19 + Attachment []domain.Attachment `json:"paymentDocumentAttachment"` //附件
19 } 20 }
20 21
21 func (cmd *CreditAccountPayCommand) Valid(validation *validation.Validation) { 22 func (cmd *CreditAccountPayCommand) Valid(validation *validation.Validation) {
@@ -29,37 +29,26 @@ type CreateCooperationContractCommand struct { @@ -29,37 +29,26 @@ type CreateCooperationContractCommand struct {
29 } `json:"cooperationContract"` 29 } `json:"cooperationContract"`
30 // 业绩分红激励规则列表 30 // 业绩分红激励规则列表
31 DividendsIncentivesRules []struct { 31 DividendsIncentivesRules []struct {
32 - // 关联的项目合约编号  
33 - CooperationContractNumber string `json:"cooperationContractNumber"`  
34 - // 推荐人抽成比例  
35 - ReferrerPercentage float64 `json:"referrerPercentage"`  
36 - // 业务员抽成比例  
37 - SalesmanPercentage float64 `json:"salesmanPercentage"`  
38 - // 分红规则激励百分点  
39 - DividendsPercentage float64 `json:"dividendsPercentage"`  
40 - // 分红规则激励阶段，  
41 - DividendsStage int `json:"dividendsStage"`  
42 - // 分红规则激励阶段结束  
43 - DividendsStageEnd int `json:"dividendsStageEnd"`  
44 - // 分红规则激励阶段开始  
45 - DividendsStageStart int `json:"dividendsStageStart"`  
46 - } `json:"dividendsIncentivesRules"`  
47 - // 金额激励规则列表 32 + CooperationContractNumber string `json:"cooperationContractNumber"` // 关联的项目合约编号
  33 + ReferrerPercentage float64 `json:"referrerPercentage"` // 推荐人抽成比例
  34 + SalesmanPercentage float64 `json:"salesmanPercentage"` // 业务员抽成比例
  35 + DividendsPercentage float64 `json:"dividendsPercentage"` // 分红规则激励百分点
  36 + DividendsStage int `json:"dividendsStage"` // 分红规则激励阶段，
  37 + DividendsStageEnd int `json:"dividendsStageEnd"` // 分红规则激励阶段结束
  38 + DividendsStageStart int `json:"dividendsStageStart"` // 分红规则激励阶段开始
  39 + Remarks string `json:"remarks"`
  40 + } `json:"dividendsIncentivesRules"` // 金额激励规则列表
  41 +
48 MoneyIncentivesRules []struct { 42 MoneyIncentivesRules []struct {
49 // 金额激励规则ID 43 // 金额激励规则ID
50 - MoneyIncentivesRuleId int64 `json:"moneyIncentivesRuleId,string,"`  
51 - // 关联的共创合约编号  
52 - CooperationContractNumber string `json:"cooperationContractNumber"`  
53 - // 激励金额  
54 - MoneyIncentivesAmount float64 `json:"moneyIncentivesAmount"`  
55 - // 金额激励阶段  
56 - MoneyIncentivesStage int `json:"moneyIncentivesStage"`  
57 - // 金额激励规则时间  
58 - MoneyIncentivesTime int `json:"moneyIncentivesTime"`  
59 - // 推荐人抽成比例  
60 - ReferrerPercentage float64 `json:"referrerPercentage"`  
61 - // 业务员抽成比例  
62 - SalesmanPercentage float64 `json:"salesmanPercentage"` 44 + // MoneyIncentivesRuleId int64 `json:"moneyIncentivesRuleId,string,"`
  45 + CooperationContractNumber string `json:"cooperationContractNumber"` // 关联的共创合约编号
  46 + MoneyIncentivesAmount float64 `json:"moneyIncentivesAmount"` // 激励金额
  47 + MoneyIncentivesStage int `json:"moneyIncentivesStage"` // 金额激励阶段
  48 + MoneyIncentivesTime int `json:"moneyIncentivesTime"` // 金额激励规则时间
  49 + ReferrerPercentage float64 `json:"referrerPercentage"` // 推荐人抽成比例
  50 + SalesmanPercentage float64 `json:"salesmanPercentage"` // 业务员抽成比例
  51 + Remarks string `json:"remarks"`
63 } `json:"moneyIncentivesRules"` 52 } `json:"moneyIncentivesRules"`
64 // 承接方列表 53 // 承接方列表
65 Undertakers []struct { 54 Undertakers []struct {
@@ -70,7 +59,7 @@ type CreateCooperationContractCommand struct { @@ -70,7 +59,7 @@ type CreateCooperationContractCommand struct {
70 Attachment []domain.Attachment `json:"attachment"` 59 Attachment []domain.Attachment `json:"attachment"`
71 } `json:"undertakers"` 60 } `json:"undertakers"`
72 //关联业务员 61 //关联业务员
73 - RelevantIds []string `json:"relevantIds"` 62 + RelationUser []string `json:"relationUser"`
74 } 63 }
75 64
76 func (createCooperationContractCommand *CreateCooperationContractCommand) Valid(validation *validation.Validation) { 65 func (createCooperationContractCommand *CreateCooperationContractCommand) Valid(validation *validation.Validation) {
@@ -46,6 +46,7 @@ type UpdateCooperationContractCommand struct { @@ -46,6 +46,7 @@ type UpdateCooperationContractCommand struct {
46 DividendsStageEnd int `json:"dividendsStageEnd"` 46 DividendsStageEnd int `json:"dividendsStageEnd"`
47 // 分红规则激励阶段开始 47 // 分红规则激励阶段开始
48 DividendsStageStart int `json:"dividendsStageStart"` 48 DividendsStageStart int `json:"dividendsStageStart"`
  49 + Remarks string `json:"remarks"`
49 } `json:"dividendsIncentivesRules"` 50 } `json:"dividendsIncentivesRules"`
50 // 金额激励规则列表 51 // 金额激励规则列表
51 MoneyIncentivesRules []struct { 52 MoneyIncentivesRules []struct {
@@ -63,6 +64,7 @@ type UpdateCooperationContractCommand struct { @@ -63,6 +64,7 @@ type UpdateCooperationContractCommand struct {
63 ReferrerPercentage float64 `json:"referrerPercentage"` 64 ReferrerPercentage float64 `json:"referrerPercentage"`
64 // 业务员抽成比例 65 // 业务员抽成比例
65 SalesmanPercentage float64 `json:"salesmanPercentage"` 66 SalesmanPercentage float64 `json:"salesmanPercentage"`
  67 + Remarks string `json:"remarks"`
66 } `json:"moneyIncentivesRules"` 68 } `json:"moneyIncentivesRules"`
67 // 承接方列表 69 // 承接方列表
68 Undertakers []struct { 70 Undertakers []struct {
@@ -73,7 +75,7 @@ type UpdateCooperationContractCommand struct { @@ -73,7 +75,7 @@ type UpdateCooperationContractCommand struct {
73 Attachment []domain.Attachment `json:"attachment"` 75 Attachment []domain.Attachment `json:"attachment"`
74 } `json:"undertakers"` 76 } `json:"undertakers"`
75 //关联业务员 77 //关联业务员
76 - RelevantIds []string `json:"relevantIds"` 78 + RelationUser []string `json:"relationUser"`
77 } 79 }
78 80
79 func (updateCooperationContractCommand *UpdateCooperationContractCommand) Valid(validation *validation.Validation) { 81 func (updateCooperationContractCommand *UpdateCooperationContractCommand) Valid(validation *validation.Validation) {
@@ -65,6 +65,7 @@ type MoneyIncentivesRule struct { @@ -65,6 +65,7 @@ type MoneyIncentivesRule struct {
65 MoneyIncentivesTime int64 `json:"moneyIncentivesTime"` // 金额激励规则时间 65 MoneyIncentivesTime int64 `json:"moneyIncentivesTime"` // 金额激励规则时间
66 ReferrerPercentage float64 `json:"referrerPercentage"` // 推荐人抽成比例 66 ReferrerPercentage float64 `json:"referrerPercentage"` // 推荐人抽成比例
67 SalesmanPercentage float64 `json:"salesmanPercentage"` // 业务员抽成比例 67 SalesmanPercentage float64 `json:"salesmanPercentage"` // 业务员抽成比例
  68 + Remarks string `json:"remarks"`
68 } 69 }
69 70
70 type DividendsIncentivesRule struct { 71 type DividendsIncentivesRule struct {
@@ -76,10 +77,11 @@ type DividendsIncentivesRule struct { @@ -76,10 +77,11 @@ type DividendsIncentivesRule struct {
76 DividendsStage int `json:"dividendsStage"` // 分红规则激励阶段， 77 DividendsStage int `json:"dividendsStage"` // 分红规则激励阶段，
77 DividendsStageEnd int64 `json:"dividendsStageEnd"` // 分红规则激励阶段结束 78 DividendsStageEnd int64 `json:"dividendsStageEnd"` // 分红规则激励阶段结束
78 DividendsStageStart int64 `json:"dividendsStageStart"` // 分红规则激励阶段开始 79 DividendsStageStart int64 `json:"dividendsStageStart"` // 分红规则激励阶段开始
  80 + Remarks string `json:"remarks"`
79 } 81 }
80 82
81 type Relevant struct { 83 type Relevant struct {
82 - UserId int `json:"userId"` 84 + UserId int `json:"userId,string"`
83 UserInfo domain.UserInfo `json:"userInfo"` 85 UserInfo domain.UserInfo `json:"userInfo"`
84 Department domain.Department `json:"department"` 86 Department domain.Department `json:"department"`
85 } 87 }
@@ -120,9 +122,10 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon @@ -120,9 +122,10 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon
120 r := Relevant{ 122 r := Relevant{
121 UserId: int(v.UserId), 123 UserId: int(v.UserId),
122 UserInfo: domain.UserInfo{ 124 UserInfo: domain.UserInfo{
123 - UsersName: v.UserInfo.UsersName,  
124 - UsersId: v.UserInfo.UsersId, 125 + UsersName: v.UserInfo.UserName,
  126 + UsersId: int(v.UserId),
125 UserCode: v.UserInfo.UserCode, 127 UserCode: v.UserInfo.UserCode,
  128 + Phone: v.UserInfo.UserPhone,
126 }, 129 },
127 Department: domain.Department{ 130 Department: domain.Department{
128 DepartmentNumber: v.Department.DepartmentNumber, 131 DepartmentNumber: v.Department.DepartmentNumber,
@@ -142,6 +145,7 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon @@ -142,6 +145,7 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon
142 DividendsStage: v.DividendsIncentivesStage, 145 DividendsStage: v.DividendsIncentivesStage,
143 DividendsStageEnd: v.DividendsIncentivesStageEnd.UnixNano() / 1e6, 146 DividendsStageEnd: v.DividendsIncentivesStageEnd.UnixNano() / 1e6,
144 DividendsStageStart: v.DividendsIncentivesStageStart.UnixNano() / 1e6, 147 DividendsStageStart: v.DividendsIncentivesStageStart.UnixNano() / 1e6,
  148 + Remarks: v.Remarks,
145 } 149 }
146 dividendsIncentivesRules = append(dividendsIncentivesRules, r) 150 dividendsIncentivesRules = append(dividendsIncentivesRules, r)
147 } 151 }
@@ -155,6 +159,7 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon @@ -155,6 +159,7 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon
155 MoneyIncentivesTime: v.MoneyIncentivesTime.UnixNano() / 1e6, 159 MoneyIncentivesTime: v.MoneyIncentivesTime.UnixNano() / 1e6,
156 ReferrerPercentage: v.ReferrerPercentage, 160 ReferrerPercentage: v.ReferrerPercentage,
157 SalesmanPercentage: v.SalesmanPercentage, 161 SalesmanPercentage: v.SalesmanPercentage,
  162 + Remarks: v.Remarks,
158 } 163 }
159 moneyIncentivesRules = append(moneyIncentivesRules, r) 164 moneyIncentivesRules = append(moneyIncentivesRules, r)
160 } 165 }
@@ -11,7 +11,7 @@ type GetCooperationContractQuery struct { @@ -11,7 +11,7 @@ type GetCooperationContractQuery struct {
11 //操作人 11 //操作人
12 Operator domain.Operator `json:"-"` 12 Operator domain.Operator `json:"-"`
13 // 共创合约ID 13 // 共创合约ID
14 - CooperationContractId int `json:"cooperationContractId,string" valid:"Required"` 14 + CooperationContractId int `json:"cooperationContractId,string"`
15 } 15 }
16 16
17 func (getCooperationContractQuery *GetCooperationContractQuery) Valid(validation *validation.Validation) { 17 func (getCooperationContractQuery *GetCooperationContractQuery) Valid(validation *validation.Validation) {
@@ -30,6 +30,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC @@ -30,6 +30,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC
30 DividendsIncentivesStage: v.DividendsStage, 30 DividendsIncentivesStage: v.DividendsStage,
31 DividendsIncentivesStageEnd: time.Unix(int64(v.DividendsStageEnd/1e3), 0), 31 DividendsIncentivesStageEnd: time.Unix(int64(v.DividendsStageEnd/1e3), 0),
32 DividendsIncentivesStageStart: time.Unix(int64(v.DividendsStageStart/1e3), 0), 32 DividendsIncentivesStageStart: time.Unix(int64(v.DividendsStageStart/1e3), 0),
  33 + Remarks: v.Remarks,
33 } 34 }
34 rules1 = append(rules1, r) 35 rules1 = append(rules1, r)
35 } 36 }
@@ -43,6 +44,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC @@ -43,6 +44,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC
43 MoneyIncentivesTime: time.Unix(int64(v.MoneyIncentivesTime/1e3), 0), 44 MoneyIncentivesTime: time.Unix(int64(v.MoneyIncentivesTime/1e3), 0),
44 ReferrerPercentage: v.ReferrerPercentage, 45 ReferrerPercentage: v.ReferrerPercentage,
45 SalesmanPercentage: v.SalesmanPercentage, 46 SalesmanPercentage: v.SalesmanPercentage,
  47 + Remarks: v.Remarks,
46 } 48 }
47 rules2 = append(rules2, r) 49 rules2 = append(rules2, r)
48 } 50 }
@@ -61,7 +63,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC @@ -61,7 +63,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC
61 MoneyIncentivesRules: rules2, 63 MoneyIncentivesRules: rules2,
62 DividendsIncentivesRules: rules1, 64 DividendsIncentivesRules: rules1,
63 Undertakers: underTakers, 65 Undertakers: underTakers,
64 - RelevantIds: createCooperationContractCommand.RelevantIds, 66 + RelevantIds: createCooperationContractCommand.RelationUser,
65 CooperationContractDescription: createCooperationContractCommand.CooperationContract.CooperationContractDescription, 67 CooperationContractDescription: createCooperationContractCommand.CooperationContract.CooperationContractDescription,
66 CooperationProjectNumber: createCooperationContractCommand.CooperationContract.CooperationProjectNumber, 68 CooperationProjectNumber: createCooperationContractCommand.CooperationContract.CooperationProjectNumber,
67 DepartmentId: createCooperationContractCommand.CooperationContract.DepartmentId, 69 DepartmentId: createCooperationContractCommand.CooperationContract.DepartmentId,
@@ -185,9 +187,9 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC @@ -185,9 +187,9 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
185 MoneyIncentivesRules: rules2, 187 MoneyIncentivesRules: rules2,
186 DividendsIncentivesRules: rules1, 188 DividendsIncentivesRules: rules1,
187 Undertakers: underTakers, 189 Undertakers: underTakers,
188 - RelevantIds: updateCooperationContractCommand.RelevantIds, 190 + RelevantIds: updateCooperationContractCommand.RelationUser,
189 CooperationContractDescription: updateCooperationContractCommand.CooperationContract.CooperationContractDescription, 191 CooperationContractDescription: updateCooperationContractCommand.CooperationContract.CooperationContractDescription,
190 - CooperationContractNumber: updateCooperationContractCommand.CooperationContract.CooperationContractNumber, 192 + // CooperationContractNumber: updateCooperationContractCommand.CooperationContract.CooperationContractNumber,
191 CooperationProjectNumber: updateCooperationContractCommand.CooperationContract.CooperationProjectNumber, 193 CooperationProjectNumber: updateCooperationContractCommand.CooperationContract.CooperationProjectNumber,
192 DepartmentId: updateCooperationContractCommand.CooperationContract.DepartmentId, 194 DepartmentId: updateCooperationContractCommand.CooperationContract.DepartmentId,
193 CooperationContractUndertakerType: updateCooperationContractCommand.CooperationContract.CooperationContractUndertakerType, 195 CooperationContractUndertakerType: updateCooperationContractCommand.CooperationContract.CooperationContractUndertakerType,
@@ -84,6 +84,8 @@ type CooperationApplicationItem struct { @@ -84,6 +84,8 @@ type CooperationApplicationItem struct {
84 Org domain.Org `json:"org"` 84 Org domain.Org `json:"org"`
85 UserBaseID int `json:"userBaseId,string"` 85 UserBaseID int `json:"userBaseId,string"`
86 UserID int `json:"userId,string"` 86 UserID int `json:"userId,string"`
  87 + UserName string `json:"userName"`
  88 + UserCode string `json:"userCode"`
87 UserInfo domain.UserInfo `json:"userInfo"` 89 UserInfo domain.UserInfo `json:"userInfo"`
88 UserType int `json:"userType"` 90 UserType int `json:"userType"`
89 } `json:"cooperationApplicationApplicant"` //申请人 91 } `json:"cooperationApplicationApplicant"` //申请人
@@ -113,6 +115,8 @@ func ToCooperationApplicationItem(param *allied_creation_cooperation.Cooperation @@ -113,6 +115,8 @@ func ToCooperationApplicationItem(param *allied_creation_cooperation.Cooperation
113 data.CooperationApplicationApplicant.Org.OrgID = param.Org.OrgID 115 data.CooperationApplicationApplicant.Org.OrgID = param.Org.OrgID
114 data.CooperationApplicationApplicant.Org.OrgName = param.Org.OrgName 116 data.CooperationApplicationApplicant.Org.OrgName = param.Org.OrgName
115 data.CooperationApplicationApplicant.UserID = param.CooperationApplicationApplicant.UserID 117 data.CooperationApplicationApplicant.UserID = param.CooperationApplicationApplicant.UserID
  118 + data.CooperationApplicationApplicant.UserName = param.CooperationApplicationApplicant.UserInfo.UserName
  119 + data.CooperationApplicationApplicant.UserCode = param.CooperationApplicationApplicant.UserInfo.UserCode
116 //data.CooperationApplicationApplicant.UserType = param.CooperationApplicationApplicant. 120 //data.CooperationApplicationApplicant.UserType = param.CooperationApplicationApplicant.
117 data.CooperationApplicationApplicant.UserInfo.Phone = param.CooperationApplicationApplicant.UserInfo.UserPhone 121 data.CooperationApplicationApplicant.UserInfo.Phone = param.CooperationApplicationApplicant.UserInfo.UserPhone
118 data.CooperationApplicationApplicant.UserInfo.UsersName = param.CooperationApplicationApplicant.UserInfo.UserName 122 data.CooperationApplicationApplicant.UserInfo.UsersName = param.CooperationApplicationApplicant.UserInfo.UserName
@@ -7,5 +7,5 @@ type PayCreditAccountCommand struct { @@ -7,5 +7,5 @@ type PayCreditAccountCommand struct {
7 CreditAccountId int `json:"creditAccountId,string"` //账期结算id 7 CreditAccountId int `json:"creditAccountId,string"` //账期结算id
8 ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际金额 8 ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际金额
9 Remarks string `json:"remarks"` //备注 9 Remarks string `json:"remarks"` //备注
10 - Attachment domain.Attachment `json:"attachment"` //附件 10 + Attachment []domain.Attachment `json:"attachment"` //附件
11 } 11 }
@@ -9,6 +9,7 @@ type GetDividendsOrderQuery struct { @@ -9,6 +9,7 @@ type GetDividendsOrderQuery struct {
9 Operator domain.Operator `json:"-"` 9 Operator domain.Operator `json:"-"`
10 // 分红订单ID 10 // 分红订单ID
11 DividendsOrderId int `json:"dividendsOrderId,string" valid:"Required"` 11 DividendsOrderId int `json:"dividendsOrderId,string" valid:"Required"`
  12 + DividendsOrderNumber string `json:"dividendsOrderNumber"`
12 } 13 }
13 14
14 // func (getDividendsOrderQuery *GetDividendsOrderQuery) Valid(validation *validation.Validation) { 15 // func (getDividendsOrderQuery *GetDividendsOrderQuery) Valid(validation *validation.Validation) {
@@ -55,12 +55,10 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD @@ -55,12 +55,10 @@ func (dividendsOrderService *DividendsOrderService) CreateDividendsOrder(createD
55 55
56 // 返回分红订单实体对象 56 // 返回分红订单实体对象
57 func (dividendsOrderService *DividendsOrderService) GetDividendsOrder(getDividendsOrderQuery *query.GetDividendsOrderQuery) (interface{}, error) { 57 func (dividendsOrderService *DividendsOrderService) GetDividendsOrder(getDividendsOrderQuery *query.GetDividendsOrderQuery) (interface{}, error) {
58 - // if err := getDividendsOrderQuery.ValidateQuery(); err != nil {  
59 - // return nil, application.ThrowError(application.ARG_ERROR, err.Error())  
60 - // }  
61 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(getDividendsOrderQuery.Operator) 58 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(getDividendsOrderQuery.Operator)
62 result, err := creationCooperationGateway.DividendsOrderGet(allied_creation_cooperation.ReqDividendsOrderGet{ 59 result, err := creationCooperationGateway.DividendsOrderGet(allied_creation_cooperation.ReqDividendsOrderGet{
63 DividendsOrderId: getDividendsOrderQuery.DividendsOrderId, 60 DividendsOrderId: getDividendsOrderQuery.DividendsOrderId,
  61 + DividendsOrderNumber: getDividendsOrderQuery.DividendsOrderNumber,
64 }) 62 })
65 if err != nil { 63 if err != nil {
66 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error()) 64 return nil, application.ThrowError(application.TRANSACTION_ERROR, err.Error())
@@ -19,7 +19,7 @@ type CreateDividendsReturnedOrderCommand struct { @@ -19,7 +19,7 @@ type CreateDividendsReturnedOrderCommand struct {
19 OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量 19 OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量
20 } `json:"orderGoods"` //货品 20 } `json:"orderGoods"` //货品
21 DividendsReturnedDate int64 `json:"dividendsReturnedDate"` //退货日期 21 DividendsReturnedDate int64 `json:"dividendsReturnedDate"` //退货日期
22 - OrderDate int64 `json:"orderDate"` //订单日期 22 + OrderTime int64 `json:"orderTime"` //订单日期
23 Remarks string `json:"remarks"` // 23 Remarks string `json:"remarks"` //
24 RegionName string `json:"regionName"` 24 RegionName string `json:"regionName"`
25 } 25 }
@@ -20,7 +20,7 @@ type UpdateDividendsReturnedOrderCommand struct { @@ -20,7 +20,7 @@ type UpdateDividendsReturnedOrderCommand struct {
20 OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量 20 OrderGoodQuantity int `json:"orderGoodQuantity"` //订单产品数量
21 } `json:"orderGoods"` //货品 21 } `json:"orderGoods"` //货品
22 DividendsReturnedDate int64 `json:"dividendsReturnedDate"` //退货日期 22 DividendsReturnedDate int64 `json:"dividendsReturnedDate"` //退货日期
23 - OrderDate int64 `json:"orderDate"` //订单日期 23 + OrderTime int64 `json:"orderTime"` //订单日期
24 24
25 Remarks string `json:"remarks"` // 25 Remarks string `json:"remarks"` //
26 RegionName string `json:"regionName"` 26 RegionName string `json:"regionName"`
@@ -19,7 +19,7 @@ type DividendsReturnedOrderService struct { @@ -19,7 +19,7 @@ type DividendsReturnedOrderService struct {
19 func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDividendsReturnedOrder(createDividendsReturnedOrderCommand *command.CreateDividendsReturnedOrderCommand) (interface{}, error) { 19 func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDividendsReturnedOrder(createDividendsReturnedOrderCommand *command.CreateDividendsReturnedOrderCommand) (interface{}, error) {
20 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(createDividendsReturnedOrderCommand.Operator) 20 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(createDividendsReturnedOrderCommand.Operator)
21 dividendsReturnedDate := time.Unix(createDividendsReturnedOrderCommand.DividendsReturnedDate/1e3, 0) 21 dividendsReturnedDate := time.Unix(createDividendsReturnedOrderCommand.DividendsReturnedDate/1e3, 0)
22 - orderDate := time.Unix(createDividendsReturnedOrderCommand.OrderDate/1e3, 0) 22 + orderDate := time.Unix(createDividendsReturnedOrderCommand.OrderTime/1e3, 0)
23 var orderGooods []allied_creation_cooperation.ReqDividendsReturnedOrderGood 23 var orderGooods []allied_creation_cooperation.ReqDividendsReturnedOrderGood
24 for _, v := range createDividendsReturnedOrderCommand.OrderGoods { 24 for _, v := range createDividendsReturnedOrderCommand.OrderGoods {
25 good := allied_creation_cooperation.ReqDividendsReturnedOrderGood{ 25 good := allied_creation_cooperation.ReqDividendsReturnedOrderGood{
@@ -38,7 +38,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDivide @@ -38,7 +38,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) CreateDivide
38 OriginalOrderNum: createDividendsReturnedOrderCommand.OriginalOrderNum, 38 OriginalOrderNum: createDividendsReturnedOrderCommand.OriginalOrderNum,
39 OrderGoods: orderGooods, 39 OrderGoods: orderGooods,
40 DividendsReturnedDate: dividendsReturnedDate, 40 DividendsReturnedDate: dividendsReturnedDate,
41 - OrderData: orderDate, 41 + OrderTime: orderDate,
42 OrgId: int(createDividendsReturnedOrderCommand.Operator.OrgId), 42 OrgId: int(createDividendsReturnedOrderCommand.Operator.OrgId),
43 Remarks: createDividendsReturnedOrderCommand.Remarks, 43 Remarks: createDividendsReturnedOrderCommand.Remarks,
44 RegionName: createDividendsReturnedOrderCommand.RegionName, 44 RegionName: createDividendsReturnedOrderCommand.RegionName,
@@ -97,7 +97,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SearchDivide @@ -97,7 +97,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SearchDivide
97 func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDividendsReturnedOrder(updateDividendsReturnedOrderCommand *command.UpdateDividendsReturnedOrderCommand) (interface{}, error) { 97 func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDividendsReturnedOrder(updateDividendsReturnedOrderCommand *command.UpdateDividendsReturnedOrderCommand) (interface{}, error) {
98 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateDividendsReturnedOrderCommand.Operator) 98 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateDividendsReturnedOrderCommand.Operator)
99 dividendsReturnedDate := time.Unix(updateDividendsReturnedOrderCommand.DividendsReturnedDate/1e3, 0) 99 dividendsReturnedDate := time.Unix(updateDividendsReturnedOrderCommand.DividendsReturnedDate/1e3, 0)
100 - orderDate := time.Unix(updateDividendsReturnedOrderCommand.OrderDate/1e3, 0) 100 + orderDate := time.Unix(updateDividendsReturnedOrderCommand.OrderTime/1e3, 0)
101 var orderGooods []allied_creation_cooperation.ReqDividendsReturnedOrderGood 101 var orderGooods []allied_creation_cooperation.ReqDividendsReturnedOrderGood
102 for _, v := range updateDividendsReturnedOrderCommand.OrderGoods { 102 for _, v := range updateDividendsReturnedOrderCommand.OrderGoods {
103 good := allied_creation_cooperation.ReqDividendsReturnedOrderGood{ 103 good := allied_creation_cooperation.ReqDividendsReturnedOrderGood{
@@ -107,7 +107,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDivide @@ -107,7 +107,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDivide
107 OrderGoodPrice: v.OrderGoodPrice, 107 OrderGoodPrice: v.OrderGoodPrice,
108 OrderGoodQuantity: v.OrderGoodQuantity, 108 OrderGoodQuantity: v.OrderGoodQuantity,
109 } 109 }
110 - good.OrderGoodPrice = good.OrderGoodPrice * float64(good.OrderGoodQuantity) 110 + good.OrderGoodAmount = good.OrderGoodPrice * float64(good.OrderGoodQuantity)
111 orderGooods = append(orderGooods, good) 111 orderGooods = append(orderGooods, good)
112 } 112 }
113 _, err := creationCooperationGateway.DividendsReturnedOrderUpdate(allied_creation_cooperation.ReqDividendsReturnedOrderUpdate{ 113 _, err := creationCooperationGateway.DividendsReturnedOrderUpdate(allied_creation_cooperation.ReqDividendsReturnedOrderUpdate{
@@ -117,7 +117,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDivide @@ -117,7 +117,7 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDivide
117 OriginalOrderNum: updateDividendsReturnedOrderCommand.OriginalOrderNum, 117 OriginalOrderNum: updateDividendsReturnedOrderCommand.OriginalOrderNum,
118 OrderGoods: orderGooods, 118 OrderGoods: orderGooods,
119 DividendsReturnedDate: dividendsReturnedDate, 119 DividendsReturnedDate: dividendsReturnedDate,
120 - OrderData: orderDate, 120 + OrderTime: orderDate,
121 OrgId: int(updateDividendsReturnedOrderCommand.Operator.OrgId), 121 OrgId: int(updateDividendsReturnedOrderCommand.Operator.OrgId),
122 Remarks: updateDividendsReturnedOrderCommand.Remarks, 122 Remarks: updateDividendsReturnedOrderCommand.Remarks,
123 RegionName: updateDividendsReturnedOrderCommand.RegionName, 123 RegionName: updateDividendsReturnedOrderCommand.RegionName,
@@ -203,6 +203,9 @@ func (gateway HttplibAlliedCreationCooperation) DividendsOrderGet(param ReqDivid @@ -203,6 +203,9 @@ func (gateway HttplibAlliedCreationCooperation) DividendsOrderGet(param ReqDivid
203 url := gateway.baseUrL + "/dividends-orders/" + strconv.Itoa(param.DividendsOrderId) 203 url := gateway.baseUrL + "/dividends-orders/" + strconv.Itoa(param.DividendsOrderId)
204 method := "GET" 204 method := "GET"
205 req := gateway.CreateRequest(url, method) 205 req := gateway.CreateRequest(url, method)
  206 + if len(param.DividendsOrderNumber) > 0 {
  207 + req.Param("dividendsOrderNumber", param.DividendsOrderNumber)
  208 + }
206 log.Logger.Debug("向业务模块请求数据：返回分红订单详情。", map[string]interface{}{ 209 log.Logger.Debug("向业务模块请求数据：返回分红订单详情。", map[string]interface{}{
207 "api": method + ":" + url, 210 "api": method + ":" + url,
208 "param": param, 211 "param": param,
@@ -113,7 +113,14 @@ type CooperationContract struct { @@ -113,7 +113,14 @@ type CooperationContract struct {
113 OrgId int64 `json:"orgId,string,"` // 组织机构ID 113 OrgId int64 `json:"orgId,string,"` // 组织机构ID
114 OrgName string `json:"orgName"` // 组织名称 114 OrgName string `json:"orgName"` // 组织名称
115 } `json:"org"` 115 } `json:"org"`
116 - UserInfo domain.UserInfo `json:"userInfo"` 116 + UserInfo struct {
  117 + UserAvatar string `json:"userAvatar"`
  118 + UserEmail string `json:"userEmail"`
  119 + UserName string `json:"userName"`
  120 + UserPhone string `json:"userPhone"`
  121 + UserAccount string `json:"userAccount"`
  122 + UserCode string `json:"userCode"`
  123 + } `json:"userInfo"`
117 Department struct { 124 Department struct {
118 DepartmentId int64 `json:"departmentId,string,"` // 部门ID 125 DepartmentId int64 `json:"departmentId,string,"` // 部门ID
119 DepartmentName string `json:"departmentName"` // 部门名称 126 DepartmentName string `json:"departmentName"` // 部门名称
@@ -138,6 +145,7 @@ type ( @@ -138,6 +145,7 @@ type (
138 DividendsIncentivesStage int `json:"dividendsIncentivesStage"` // 分红规则激励阶段， 145 DividendsIncentivesStage int `json:"dividendsIncentivesStage"` // 分红规则激励阶段，
139 DividendsIncentivesStageEnd time.Time `json:"dividendsIncentivesStageEnd"` // 分红规则激励阶段结束 146 DividendsIncentivesStageEnd time.Time `json:"dividendsIncentivesStageEnd"` // 分红规则激励阶段结束
140 DividendsIncentivesStageStart time.Time `json:"dividendsIncentivesStageStart"` // 分红规则激励阶段开始 147 DividendsIncentivesStageStart time.Time `json:"dividendsIncentivesStageStart"` // 分红规则激励阶段开始
  148 + Remarks string `json:"remarks"`
141 } 149 }
142 //金额激励规则 150 //金额激励规则
143 MoneyIncentivesRule struct { 151 MoneyIncentivesRule struct {
@@ -148,6 +156,7 @@ type ( @@ -148,6 +156,7 @@ type (
148 MoneyIncentivesTime time.Time `json:"moneyIncentivesTime"` // 金额激励规则时间 156 MoneyIncentivesTime time.Time `json:"moneyIncentivesTime"` // 金额激励规则时间
149 ReferrerPercentage float64 `json:"referrerPercentage"` // 推荐人抽成比例 157 ReferrerPercentage float64 `json:"referrerPercentage"` // 推荐人抽成比例
150 SalesmanPercentage float64 `json:"salesmanPercentage"` // 业务员抽成比例 158 SalesmanPercentage float64 `json:"salesmanPercentage"` // 业务员抽成比例
  159 + Remarks string `json:"remarks"`
151 } 160 }
152 161
153 //合约承接方 162 //合约承接方
@@ -161,7 +170,7 @@ type ( @@ -161,7 +170,7 @@ type (
161 170
162 ReqCooperationContractAdd struct { 171 ReqCooperationContractAdd struct {
163 CooperationContractDescription string `json:"cooperationContractDescription"` // 共创合约描述 172 CooperationContractDescription string `json:"cooperationContractDescription"` // 共创合约描述
164 - CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号 173 + // CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号
165 CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号， 174 CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号，
166 DepartmentId string `json:"departmentId"` // 共创合约发起部门id 175 DepartmentId string `json:"departmentId"` // 共创合约发起部门id
167 CooperationContractUndertakerType []int `json:"cooperationContractUndertakerTypes"` // 共创合约承接对象，1员工，2共创用户，3公开 176 CooperationContractUndertakerType []int `json:"cooperationContractUndertakerTypes"` // 共创合约承接对象，1员工，2共创用户，3公开
@@ -188,7 +197,7 @@ type ( @@ -188,7 +197,7 @@ type (
188 ReqCooperationContractUpdate struct { 197 ReqCooperationContractUpdate struct {
189 CooperationContractId int `json:"cooperationContractId,string"` // 共创合约id 198 CooperationContractId int `json:"cooperationContractId,string"` // 共创合约id
190 CooperationContractDescription string `json:"cooperationContractDescription"` //共创 199 CooperationContractDescription string `json:"cooperationContractDescription"` //共创
191 - CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号 200 + // CooperationContractNumber string `json:"cooperationContractNumber"` // 共创合约编号
192 CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号， 201 CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号，
193 DepartmentId string `json:"departmentId"` // 共创合约发起部门id 202 DepartmentId string `json:"departmentId"` // 共创合约发起部门id
194 CooperationContractUndertakerType []int `json:"cooperationContractUndertakerTypes"` // 共创合约承接对象，1员工，2共创用户，3公开 203 CooperationContractUndertakerType []int `json:"cooperationContractUndertakerTypes"` // 共创合约承接对象，1员工，2共创用户，3公开
@@ -144,7 +144,7 @@ type ( @@ -144,7 +144,7 @@ type (
144 CooperationModeIds []string `json:"cooperationModeIds"` 144 CooperationModeIds []string `json:"cooperationModeIds"`
145 } 145 }
146 146
147 - DataCooperationModeBatchRemove struct { 147 + DataCooperationModeBatchRemove []struct {
148 } 148 }
149 ) 149 )
150 150
@@ -56,7 +56,7 @@ type ( @@ -56,7 +56,7 @@ type (
56 CreditAccountId int `json:"creditAccountId,string"` 56 CreditAccountId int `json:"creditAccountId,string"`
57 ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际支付金额 57 ActuallyPaidAmount float64 `json:"actuallyPaidAmount"` //实际支付金额
58 Remarks string `json:"remarks"` 58 Remarks string `json:"remarks"`
59 - Attachment domain.Attachment `json:"paymentDocumentAttachment"` //附件 59 + Attachment []domain.Attachment `json:"paymentDocumentAttachment"` //附件
60 } 60 }
61 61
62 DataCreditAccountsPay struct { 62 DataCreditAccountsPay struct {
@@ -173,6 +173,7 @@ type ( @@ -173,6 +173,7 @@ type (
173 type ( 173 type (
174 ReqDividendsOrderGet struct { 174 ReqDividendsOrderGet struct {
175 DividendsOrderId int `json:"dividendsOrderId"` 175 DividendsOrderId int `json:"dividendsOrderId"`
  176 + DividendsOrderNumber string `json:"dividendsOrderNumber"`
176 } 177 }
177 178
178 DataDividendsOrderGet struct { 179 DataDividendsOrderGet struct {
@@ -11,6 +11,7 @@ type ( @@ -11,6 +11,7 @@ type (
11 OrderGoodName string `json:"orderGoodName"` //订单产品名称 11 OrderGoodName string `json:"orderGoodName"` //订单产品名称
12 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价 12 OrderGoodPrice float64 `json:"orderGoodPrice"` //订单产品单价
13 OrderGoodQuantity int `json:"orderGoodQuantity,string"` //订单产品数量 13 OrderGoodQuantity int `json:"orderGoodQuantity,string"` //订单产品数量
  14 + OrderGoodDividendsStatus int `json:"orderGoodDividendsStatus"` // 订单产品分红状态， 1待分红，2已分红
14 } 15 }
15 16
16 DividendsReturnedOrder struct { 17 DividendsReturnedOrder struct {
@@ -61,7 +62,7 @@ type ( @@ -61,7 +62,7 @@ type (
61 OriginalOrderNum string `json:"originalOrderNum"` 62 OriginalOrderNum string `json:"originalOrderNum"`
62 OrderGoods []ReqDividendsReturnedOrderGood `json:"orderGoods"` 63 OrderGoods []ReqDividendsReturnedOrderGood `json:"orderGoods"`
63 DividendsReturnedDate time.Time `json:"dividendsReturnedDate"` 64 DividendsReturnedDate time.Time `json:"dividendsReturnedDate"`
64 - OrderData time.Time `json:"orderData"` 65 + OrderTime time.Time `json:"orderTime"`
65 OrgId int `json:"orgId"` 66 OrgId int `json:"orgId"`
66 Remarks string `json:"remarks"` 67 Remarks string `json:"remarks"`
67 RegionName string `json:"regionName"` 68 RegionName string `json:"regionName"`
@@ -81,7 +82,7 @@ type ( @@ -81,7 +82,7 @@ type (
81 OriginalOrderNum string `json:"originalOrderNum"` 82 OriginalOrderNum string `json:"originalOrderNum"`
82 OrderGoods []ReqDividendsReturnedOrderGood `json:"orderGoods"` 83 OrderGoods []ReqDividendsReturnedOrderGood `json:"orderGoods"`
83 DividendsReturnedDate time.Time `json:"dividendsReturnedDate"` 84 DividendsReturnedDate time.Time `json:"dividendsReturnedDate"`
84 - OrderData time.Time `json:"orderData"` 85 + OrderTime time.Time `json:"orderTime"`
85 OrgId int `json:"orgId"` 86 OrgId int `json:"orgId"`
86 Remarks string `json:"remarks"` 87 Remarks string `json:"remarks"`
87 RegionName string `json:"regionName"` 88 RegionName string `json:"regionName"`
@@ -60,7 +60,9 @@ func (controller *DividendsOrderController) GetDividendsOrder() { @@ -60,7 +60,9 @@ func (controller *DividendsOrderController) GetDividendsOrder() {
60 dividendsOrderService := service.NewDividendsOrderService(nil) 60 dividendsOrderService := service.NewDividendsOrderService(nil)
61 getDividendsOrderQuery := &query.GetDividendsOrderQuery{} 61 getDividendsOrderQuery := &query.GetDividendsOrderQuery{}
62 orderId, _ := controller.GetInt(":orderId") 62 orderId, _ := controller.GetInt(":orderId")
  63 + dividendsOrderNumber := controller.GetString("dividendsOrderNumber")
63 getDividendsOrderQuery.DividendsOrderId = orderId 64 getDividendsOrderQuery.DividendsOrderId = orderId
  65 + getDividendsOrderQuery.DividendsOrderNumber = dividendsOrderNumber
64 getDividendsOrderQuery.Operator = controller.GetOperator() 66 getDividendsOrderQuery.Operator = controller.GetOperator()
65 data, err := dividendsOrderService.GetDividendsOrder(getDividendsOrderQuery) 67 data, err := dividendsOrderService.GetDividendsOrder(getDividendsOrderQuery)
66 controller.Response(data, err) 68 controller.Response(data, err)