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

转到一个项目

作者 yangfu
提交 031400d4a53cc8177c9dee616dccc1d501579216 2 个父辈 f86a15f7 ece7bbc6

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

内嵌 并排对比
正在显示 2 个修改的文件 包含 3 行增加 和 3 行删除
@@ -94,7 +94,7 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsEstimat @@ -94,7 +94,7 @@ func (dividendsEstimateService *DividendsEstimateService) SearchDividendsEstimat
94 OrderOrReturnedOrderNum: v.OrderOrReturnedOrderNum, 94 OrderOrReturnedOrderNum: v.OrderOrReturnedOrderNum,
95 CooperationProjectNumber: v.CooperationProjectNumber, 95 CooperationProjectNumber: v.CooperationProjectNumber,
96 CooperationContractNumber: v.CooperationContractNumber, 96 CooperationContractNumber: v.CooperationContractNumber,
97 - DividendsIncentivesStage: v.DividendsIncentivesStage, 97 + DividendsIncentivesStage: v.DividendsStage,
98 IsCanceled: v.IsCanceled, 98 IsCanceled: v.IsCanceled,
99 } 99 }
100 item.DividendsUser.Phone = v.DividendsUser.UserPhone 100 item.DividendsUser.Phone = v.DividendsUser.UserPhone
@@ -185,7 +185,7 @@ func (dividendsEmmateService *DividendsEstimateService) MoneyIncentivesSelector( @@ -185,7 +185,7 @@ func (dividendsEmmateService *DividendsEstimateService) MoneyIncentivesSelector(
185 ruleStage := []int{} 185 ruleStage := []int{}
186 for _, vv := range resultDividendsEstimate.Grid.List { 186 for _, vv := range resultDividendsEstimate.Grid.List {
187 if v.UserId == vv.DividendsUser.UserId { 187 if v.UserId == vv.DividendsUser.UserId {
188 - ruleStage = append(ruleStage, vv.DividendsIncentivesStage) 188 + ruleStage = append(ruleStage, vv.DividendsStage)
189 } 189 }
190 } 190 }
191 temp := dto.ContractUndertaker{ 191 temp := dto.ContractUndertaker{
@@ -64,7 +64,7 @@ type ( @@ -64,7 +64,7 @@ type (
64 OrderOrReturnedOrderNum string `json:"orderOrReturnedOrderNum"` // 分红订单号或退货单号 64 OrderOrReturnedOrderNum string `json:"orderOrReturnedOrderNum"` // 分红订单号或退货单号
65 CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号， 65 CooperationProjectNumber string `json:"cooperationProjectNumber"` // 共创项目编号，
66 CooperationContractNumber string `json:"cooperationContractNumber"` // 共创项目合约编号， 66 CooperationContractNumber string `json:"cooperationContractNumber"` // 共创项目合约编号，
67 - DividendsIncentivesStage int `json:"DividendsIncentivesStage"` // 分红阶段 67 + DividendsStage int `json:"DividendsStage"` // 分红阶段
68 IsCanceled bool `json:"isCanceled"` // 取消状态 68 IsCanceled bool `json:"isCanceled"` // 取消状态
69 DividendsUser struct { 69 DividendsUser struct {
70 UserId int `json:"userId,string,"` // 用户ID， 70 UserId int `json:"userId,string,"` // 用户ID，