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

转到一个项目

作者 tangxuhui
提交 a10a4eebaf5eb4a62c82f7f4383d3614c3ddd4b6 1 个父辈 9eb3a493

数据结构调整

内嵌 并排对比
正在显示 6 个修改的文件 包含 15 行增加 和 15 行删除
@@ -29,7 +29,7 @@ func ToCooperationContractItem(param *allied_creation_cooperation.CooperationCon @@ -29,7 +29,7 @@ func ToCooperationContractItem(param *allied_creation_cooperation.CooperationCon
29 CooperationContractName: param.CooperationContractName, 29 CooperationContractName: param.CooperationContractName,
30 CooperationContractNumber: param.CooperationContractNumber, 30 CooperationContractNumber: param.CooperationContractNumber,
31 Status: param.Status, 31 Status: param.Status,
32 - CreateTtime: int(param.CreatedAt.Unix()), 32 + CreateTtime: int(param.CreatedAt.UnixNano() / 1e6),
33 } 33 }
34 data.CooperationContractSponsor.UserId = param.CooperationContractSponsor.UserId 34 data.CooperationContractSponsor.UserId = param.CooperationContractSponsor.UserId
35 data.CooperationContractSponsor.UserName = param.CooperationContractSponsor.UserInfo.UserName 35 data.CooperationContractSponsor.UserName = param.CooperationContractSponsor.UserInfo.UserName
@@ -122,8 +122,8 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon @@ -122,8 +122,8 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon
122 SalesmanPercentage: v.SalesmanPercentage, 122 SalesmanPercentage: v.SalesmanPercentage,
123 DividendsIncentivesPercentage: v.DividendsIncentivesPercentage, 123 DividendsIncentivesPercentage: v.DividendsIncentivesPercentage,
124 DividendsIncentivesStage: v.DividendsIncentivesStage, 124 DividendsIncentivesStage: v.DividendsIncentivesStage,
125 - DividendsIncentivesStageEnd: v.DividendsIncentivesStageEnd.Unix(),  
126 - DividendsIncentivesStageStart: v.DividendsIncentivesStageStart.Unix(), 125 + DividendsIncentivesStageEnd: v.DividendsIncentivesStageEnd.UnixNano() / 1e6,
  126 + DividendsIncentivesStageStart: v.DividendsIncentivesStageStart.UnixNano() / 1e6,
127 } 127 }
128 dividendsIncentivesRules = append(dividendsIncentivesRules, r) 128 dividendsIncentivesRules = append(dividendsIncentivesRules, r)
129 } 129 }
@@ -134,7 +134,7 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon @@ -134,7 +134,7 @@ func ToCooperationContractInfo(param *allied_creation_cooperation.CooperationCon
134 CooperationContractNumber: v.CooperationContractNumber, 134 CooperationContractNumber: v.CooperationContractNumber,
135 MoneyIncentivesAmount: v.MoneyIncentivesAmount, 135 MoneyIncentivesAmount: v.MoneyIncentivesAmount,
136 MoneyIncentivesStage: v.MoneyIncentivesStage, 136 MoneyIncentivesStage: v.MoneyIncentivesStage,
137 - MoneyIncentivesTime: v.MoneyIncentivesTime.Unix(), 137 + MoneyIncentivesTime: v.MoneyIncentivesTime.UnixNano() / 1e6,
138 ReferrerPercentage: v.ReferrerPercentage, 138 ReferrerPercentage: v.ReferrerPercentage,
139 SalesmanPercentage: v.SalesmanPercentage, 139 SalesmanPercentage: v.SalesmanPercentage,
140 } 140 }
@@ -49,7 +49,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC @@ -49,7 +49,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC
49 underTakers := []allied_creation_cooperation.Undertaker{} 49 underTakers := []allied_creation_cooperation.Undertaker{}
50 for _, v := range createCooperationContractCommand.Undertakers { 50 for _, v := range createCooperationContractCommand.Undertakers {
51 u := allied_creation_cooperation.Undertaker{ 51 u := allied_creation_cooperation.Undertaker{
52 - UndertakerId: v.UndertakerId, 52 + UserId: v.UndertakerId,
53 RerferrerId: v.RerferrerId, 53 RerferrerId: v.RerferrerId,
54 SalesmanId: v.SalesmanId, 54 SalesmanId: v.SalesmanId,
55 Attachment: v.Attachment, 55 Attachment: v.Attachment,
@@ -164,7 +164,7 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC @@ -164,7 +164,7 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
164 underTakers := []allied_creation_cooperation.Undertaker{} 164 underTakers := []allied_creation_cooperation.Undertaker{}
165 for _, v := range updateCooperationContractCommand.Undertakers { 165 for _, v := range updateCooperationContractCommand.Undertakers {
166 u := allied_creation_cooperation.Undertaker{ 166 u := allied_creation_cooperation.Undertaker{
167 - UndertakerId: v.UndertakerId, 167 + UserId: v.UndertakerId,
168 RerferrerId: v.RerferrerId, 168 RerferrerId: v.RerferrerId,
169 SalesmanId: v.SalesmanId, 169 SalesmanId: v.SalesmanId,
170 Attachment: v.Attachment, 170 Attachment: v.Attachment,
@@ -35,7 +35,7 @@ func ToDividendsOrder(param *allied_creation_cooperation.DividendsOrder) *Divide @@ -35,7 +35,7 @@ func ToDividendsOrder(param *allied_creation_cooperation.DividendsOrder) *Divide
35 Company: param.Company, 35 Company: param.Company,
36 CustomerName: param.CustomerName, 36 CustomerName: param.CustomerName,
37 DividendStatus: param.DividendStatus, 37 DividendStatus: param.DividendStatus,
38 - DividendTime: param.DividendTime.Unix(), 38 + DividendTime: param.DividendTime.UnixNano() / 1e6,
39 DividendsOrderAmount: param.DividendsOrderAmount, 39 DividendsOrderAmount: param.DividendsOrderAmount,
40 DividendsOrderID: param.DividendsOrderID, 40 DividendsOrderID: param.DividendsOrderID,
41 DividendsOrderNumber: param.DividendsOrderNumber, 41 DividendsOrderNumber: param.DividendsOrderNumber,
@@ -41,12 +41,12 @@ func ToDividendsReturnedOrderInfo(param *allied_creation_cooperation.DividendsRe @@ -41,12 +41,12 @@ func ToDividendsReturnedOrderInfo(param *allied_creation_cooperation.DividendsRe
41 Org: param.Org, 41 Org: param.Org,
42 Region: param.Region, 42 Region: param.Region,
43 Company: param.Company, 43 Company: param.Company,
44 - CreatedAt: param.CreatedAt.Unix(), 44 + CreatedAt: param.CreatedAt.UnixNano() / 1e6,
45 DividendStatus: param.DividendStatus, 45 DividendStatus: param.DividendStatus,
46 - DividendTime: param.DividendTime.Unix(), 46 + DividendTime: param.DividendTime.UnixNano() / 1e6,
47 DividendsOrderNumber: param.DividendsOrderNumber, 47 DividendsOrderNumber: param.DividendsOrderNumber,
48 DividendsReturnedCustomerName: param.DividendsReturnedCustomerName, 48 DividendsReturnedCustomerName: param.DividendsReturnedCustomerName,
49 - DividendsReturnedDate: param.DividendsReturnedDate.Unix(), 49 + DividendsReturnedDate: param.DividendsReturnedDate.UnixNano() / 1e6,
50 DividendsReturnedOrderID: param.DividendsReturnedOrderID, 50 DividendsReturnedOrderID: param.DividendsReturnedOrderID,
51 DividendsReturnedOrderNumber: param.DividendsReturnedOrderNumber, 51 DividendsReturnedOrderNumber: param.DividendsReturnedOrderNumber,
52 DividendsReturnedOrderRefund: param.DividendsReturnedOrderRefund, 52 DividendsReturnedOrderRefund: param.DividendsReturnedOrderRefund,
@@ -18,8 +18,8 @@ type DividendsReturnedOrderService struct { @@ -18,8 +18,8 @@ type DividendsReturnedOrderService struct {
18 // 创建分红退货单服务 18 // 创建分红退货单服务
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, 0)  
22 - orderDate := time.Unix(createDividendsReturnedOrderCommand.OrderDate, 0) 21 + dividendsReturnedDate := time.Unix(createDividendsReturnedOrderCommand.DividendsReturnedDate/1e3, 0)
  22 + orderDate := time.Unix(createDividendsReturnedOrderCommand.OrderDate/1e3, 0)
23 result, err := creationCooperationGateway.DividendsReturnedOrderAdd(allied_creation_cooperation.ReqDividendsReturnedOrderAdd{ 23 result, err := creationCooperationGateway.DividendsReturnedOrderAdd(allied_creation_cooperation.ReqDividendsReturnedOrderAdd{
24 DividendsReturnedCustomerName: createDividendsReturnedOrderCommand.DividendsReturnedCustomerName, 24 DividendsReturnedCustomerName: createDividendsReturnedOrderCommand.DividendsReturnedCustomerName,
25 DividendsOrderNumber: createDividendsReturnedOrderCommand.DividendsOrderNumber, 25 DividendsOrderNumber: createDividendsReturnedOrderCommand.DividendsOrderNumber,
@@ -89,8 +89,8 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SearchDivide @@ -89,8 +89,8 @@ func (dividendsReturnedOrderService *DividendsReturnedOrderService) SearchDivide
89 // 更新分红退货单服务 89 // 更新分红退货单服务
90 func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDividendsReturnedOrder(updateDividendsReturnedOrderCommand *command.UpdateDividendsReturnedOrderCommand) (interface{}, error) { 90 func (dividendsReturnedOrderService *DividendsReturnedOrderService) UpdateDividendsReturnedOrder(updateDividendsReturnedOrderCommand *command.UpdateDividendsReturnedOrderCommand) (interface{}, error) {
91 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateDividendsReturnedOrderCommand.Operator) 91 creationCooperationGateway := allied_creation_cooperation.NewHttplibAlliedCreationCooperation(updateDividendsReturnedOrderCommand.Operator)
92 - dividendsReturnedDate := time.Unix(updateDividendsReturnedOrderCommand.DividendsReturnedDate, 0)  
93 - orderDate := time.Unix(updateDividendsReturnedOrderCommand.OrderDate, 0) 92 + dividendsReturnedDate := time.Unix(updateDividendsReturnedOrderCommand.DividendsReturnedDate/1e3, 0)
  93 + orderDate := time.Unix(updateDividendsReturnedOrderCommand.OrderDate/1e3, 0)
94 _, err := creationCooperationGateway.DividendsReturnedOrderUpdate(allied_creation_cooperation.ReqDividendsReturnedOrderUpdate{ 94 _, err := creationCooperationGateway.DividendsReturnedOrderUpdate(allied_creation_cooperation.ReqDividendsReturnedOrderUpdate{
95 DividendsReturnedOrderID: updateDividendsReturnedOrderCommand.DividendsReturnedOrderID, 95 DividendsReturnedOrderID: updateDividendsReturnedOrderCommand.DividendsReturnedOrderID,
96 DividendsReturnedCustomerName: updateDividendsReturnedOrderCommand.DividendsReturnedCustomerName, 96 DividendsReturnedCustomerName: updateDividendsReturnedOrderCommand.DividendsReturnedCustomerName,
@@ -142,7 +142,7 @@ type ( @@ -142,7 +142,7 @@ type (
142 142
143 //合约承接方 143 //合约承接方
144 Undertaker struct { 144 Undertaker struct {
145 - UndertakerId string `json:"undertakerId"` //承接人用户id 145 + UserId string `json:"userId"` //承接人用户id
146 RerferrerId string `json:"rerferrerId"` //推荐人用户id 146 RerferrerId string `json:"rerferrerId"` //推荐人用户id
147 SalesmanId string `json:"salesmanId"` //关联业务员id 147 SalesmanId string `json:"salesmanId"` //关联业务员id
148 Attachment []domain.Attachment `json:"attachment"` 148 Attachment []domain.Attachment `json:"attachment"`