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

转到一个项目

作者 yangfu
提交 17f0eb91781894c74b7efd80bce062d512635961 2 个父辈 4c81fa9f 9eb3a493

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

内嵌 并排对比
正在显示 6 个修改的文件 包含 21 行增加 和 21 行删除
... ... @@ -63,10 +63,10 @@ type CreateCooperationContractCommand struct {
} `json:"moneyIncentivesRules"`
// 承接方列表
Undertakers []struct {
UndertakerId string `json:"undertakerId"` //承接人用户id
RerferrerId string `json:"rerferrerId"` //推荐人用户id
SalesmanId string `json:"salesmanId"` //关联业务员id
Attachment domain.Attachment `json:"attachment"`
UndertakerId string `json:"undertakerId"` //承接人用户id
RerferrerId string `json:"rerferrerId"` //推荐人用户id
SalesmanId string `json:"salesmanId"` //关联业务员id
Attachment []domain.Attachment `json:"attachment"`
} `json:"undertakers"`
//关联业务员
RelevantIds []string `json:"relevantIds"`
... ...
... ... @@ -65,10 +65,10 @@ type UpdateCooperationContractCommand struct {
} `json:"moneyIncentivesRules"`
// 承接方列表
Undertakers []struct {
UndertakerId string `json:"undertakerId"` //承接人用户id
RerferrerId string `json:"rerferrerId"` //推荐人用户id
SalesmanId string `json:"salesmanId"` //关联业务员id
Attachment domain.Attachment `json:"attachment"`
UndertakerId string `json:"undertakerId"` //承接人用户id
RerferrerId string `json:"rerferrerId"` //推荐人用户id
SalesmanId string `json:"salesmanId"` //关联业务员id
Attachment []domain.Attachment `json:"attachment"`
} `json:"undertakers"`
//关联业务员
RelevantIds []string `json:"relevantIds"`
... ...
... ... @@ -28,8 +28,8 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC
SalesmanPercentage: v.SalesmanPercentage,
DividendsIncentivesPercentage: v.DividendsIncentivesPercentage,
DividendsIncentivesStage: v.DividendsIncentivesStage,
DividendsIncentivesStageEnd: time.Unix(int64(v.DividendsIncentivesStageEnd), 0),
DividendsIncentivesStageStart: time.Unix(int64(v.DividendsIncentivesStageStart), 0),
DividendsIncentivesStageEnd: time.Unix(int64(v.DividendsIncentivesStageEnd/1e3), 0),
DividendsIncentivesStageStart: time.Unix(int64(v.DividendsIncentivesStageStart/1e3), 0),
}
rules1 = append(rules1, r)
}
... ... @@ -40,7 +40,7 @@ func (cooperationContractService *CooperationContractService) CreateCooperationC
CooperationContractNumber: v.CooperationContractNumber,
MoneyIncentivesAmount: v.MoneyIncentivesAmount,
MoneyIncentivesStage: v.MoneyIncentivesStage,
MoneyIncentivesTime: time.Unix(int64(v.MoneyIncentivesTime), 0),
MoneyIncentivesTime: time.Unix(int64(v.MoneyIncentivesTime/1e3), 0),
ReferrerPercentage: v.ReferrerPercentage,
SalesmanPercentage: v.SalesmanPercentage,
}
... ... @@ -143,8 +143,8 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
SalesmanPercentage: v.SalesmanPercentage,
DividendsIncentivesPercentage: v.DividendsIncentivesPercentage,
DividendsIncentivesStage: v.DividendsIncentivesStage,
DividendsIncentivesStageEnd: time.Unix(int64(v.DividendsIncentivesStageEnd), 0),
DividendsIncentivesStageStart: time.Unix(int64(v.DividendsIncentivesStageStart), 0),
DividendsIncentivesStageEnd: time.Unix(int64(v.DividendsIncentivesStageEnd/1e3), 0),
DividendsIncentivesStageStart: time.Unix(int64(v.DividendsIncentivesStageStart/1e3), 0),
}
rules1 = append(rules1, r)
}
... ... @@ -155,7 +155,7 @@ func (cooperationContractService *CooperationContractService) UpdateCooperationC
CooperationContractNumber: v.CooperationContractNumber,
MoneyIncentivesAmount: v.MoneyIncentivesAmount,
MoneyIncentivesStage: v.MoneyIncentivesStage,
MoneyIncentivesTime: time.Unix(int64(v.MoneyIncentivesTime), 0),
MoneyIncentivesTime: time.Unix(int64(v.MoneyIncentivesTime/1e3), 0),
ReferrerPercentage: v.ReferrerPercentage,
SalesmanPercentage: v.SalesmanPercentage,
}
... ...
... ... @@ -26,8 +26,8 @@ type DividendsOrder struct {
RegionName string `json:"regionName"`
RegionNumber string `json:"regionNumber"`
} `json:"region"`
Remarks string `json:"remarks"`
Goods []allied_creation_cooperation.DividendsOrderGoods
Remarks string `json:"remarks"`
Goods []allied_creation_cooperation.DividendsOrderGoods `json:"goods"`
}
func ToDividendsOrder(param *allied_creation_cooperation.DividendsOrder) *DividendsOrder {
... ...
... ... @@ -142,10 +142,10 @@ type (
//合约承接方
Undertaker struct {
UndertakerId string `json:"undertakerId"` //承接人用户id
RerferrerId string `json:"rerferrerId"` //推荐人用户id
SalesmanId string `json:"salesmanId"` //关联业务员id
Attachment domain.Attachment `json:"attachment"`
UndertakerId string `json:"undertakerId"` //承接人用户id
RerferrerId string `json:"rerferrerId"` //推荐人用户id
SalesmanId string `json:"salesmanId"` //关联业务员id
Attachment []domain.Attachment `json:"attachment"`
}
ReqCooperationContractAdd struct {
... ...
... ... @@ -8,7 +8,7 @@ import (
func init() {
web.Router("/v1/web/dividends-returned-order/", &web_client.DividendsReturnedOrderController{}, "Post:CreateDividendsReturnedOrder")
web.Router("/v1/web/dividends-returned-order/:projectId", &web_client.DividendsReturnedOrderController{}, "Put:UpdateDividendsReturnedOrder")
web.Router("/v1/web/dividends-returned-order/:projectId", &web_client.DividendsReturnedOrderController{}, "Delete:RemoveDividendsReturnedOrder")
web.Router("/v1/web/dividends-returned-order/remove", &web_client.DividendsReturnedOrderController{}, "Post:RemoveDividendsReturnedOrder")
web.Router("/v1/web/dividends-returned-order/:projectId", &web_client.DividendsReturnedOrderController{}, "Get:GetDividendsReturnedOrder")
web.Router("/v1/web/dividends-returned-order/search", &web_client.DividendsReturnedOrderController{}, "Post:SearchDividendsReturnedOrder")
web.Router("/v1/web/dividends-returned-order/selector/dividends-order", &web_client.DividendsReturnedOrderController{}, "Post:SelectorDividendsOrder")
... ...