|
@@ -117,8 +117,8 @@ func (svr *PgLoginService) PartnerStaticInfo() (interface{}, error) { |
|
@@ -117,8 +117,8 @@ func (svr *PgLoginService) PartnerStaticInfo() (interface{}, error) { |
117
|
bonus, _ := OrderDao.OrderBonusStatics(domain.OrderBonusQuery{PartnerId: partner.Id, OrderType: domain.OrderReal})
|
117
|
bonus, _ := OrderDao.OrderBonusStatics(domain.OrderBonusQuery{PartnerId: partner.Id, OrderType: domain.OrderReal})
|
118
|
item := &Company{
|
118
|
item := &Company{
|
119
|
CompanyBase: newCompanyBase(c),
|
119
|
CompanyBase: newCompanyBase(c),
|
120
|
- IncomePercent: computeBonusPercent(totalBonus.Bonus*100, bonus.Bonus),
|
|
|
121
|
- DividendMoney: bonus.Bonus,
|
120
|
+ IncomePercent: computeBonusPercent(totalBonus.Bonus, bonus.Bonus*100),
|
|
|
121
|
+ DividendMoney: utils.Decimal(bonus.Bonus),
|
122
|
JoinWays: svr.GetJoinWays(allPartnerCategory, partner, bonus.Bonus),
|
122
|
JoinWays: svr.GetJoinWays(allPartnerCategory, partner, bonus.Bonus),
|
123
|
}
|
123
|
}
|
124
|
//当所有公司的总收入都为0时,
|
124
|
//当所有公司的总收入都为0时,
|
|
@@ -252,7 +252,7 @@ func newCompanyBase(company *domain.Company) protocol.CompanyBase { |
|
@@ -252,7 +252,7 @@ func newCompanyBase(company *domain.Company) protocol.CompanyBase { |
252
|
return protocol.CompanyBase{
|
252
|
return protocol.CompanyBase{
|
253
|
Id: company.Id,
|
253
|
Id: company.Id,
|
254
|
Name: company.Name,
|
254
|
Name: company.Name,
|
255
|
- ShortName: "TODO",
|
255
|
+ ShortName: company.Abbreviation,
|
256
|
Image: protocol.NewImage(company.Logo),
|
256
|
Image: protocol.NewImage(company.Logo),
|
257
|
Phone: company.Phone,
|
257
|
Phone: company.Phone,
|
258
|
}
|
258
|
}
|