mmm-go / partner · 提交

转到一个项目

作者 yangfu
提交 28c66d188cebae041a1f20b5cbeda9a29a7265ca 1 个父辈 bf962caa

1.review code

内嵌 并排对比
正在显示 3 个修改的文件 包含 7 行增加 和 11 行删除
@@ -152,8 +152,6 @@ func getStatistics(userId int64, transactionContext *transaction.TransactionCont @@ -152,8 +152,6 @@ func getStatistics(userId int64, transactionContext *transaction.TransactionCont
152 UsersRepository, _ = factory.CreateUsersRepository(transactionContext) 152 UsersRepository, _ = factory.CreateUsersRepository(transactionContext)
153 PartnerInfoDao, _ = factory.CreatePartnerInfoDao(transactionContext) 153 PartnerInfoDao, _ = factory.CreatePartnerInfoDao(transactionContext)
154 OrderBaseDao, _ = factory.CreateOrderBaseDao(transactionContext) 154 OrderBaseDao, _ = factory.CreateOrderBaseDao(transactionContext)
155 - //BusinessBonusDao, _ = factory.CreateBusinessBonusDao(transactionContext)  
156 - //user *domain.Users  
157 partnerIds []int64 155 partnerIds []int64
158 ) 156 )
159 if user, e := UsersRepository.FindOne(map[string]interface{}{"id": userId}); e != nil || user == nil { 157 if user, e := UsersRepository.FindOne(map[string]interface{}{"id": userId}); e != nil || user == nil {
@@ -163,10 +161,7 @@ func getStatistics(userId int64, transactionContext *transaction.TransactionCont @@ -163,10 +161,7 @@ func getStatistics(userId int64, transactionContext *transaction.TransactionCont
163 partnerIds = user.AccessPartnerIds() 161 partnerIds = user.AccessPartnerIds()
164 } 162 }
165 Statistics := make(map[string]interface{}) 163 Statistics := make(map[string]interface{})
166 - //Statistics["developDividend"] = 0  
167 - //Statistics["developOrdersMoney"] = 0  
168 - //Statistics["appDividend"] = 0  
169 - //Statistics["appOrdersMoney"] = 0 164 + // TODO:分组统计
170 if count, e := PartnerInfoDao.PartnerStatic(map[string]interface{}{"inPartnerIds": partnerIds, "inPartnerCategory": domain.Career}); e == nil { 165 if count, e := PartnerInfoDao.PartnerStatic(map[string]interface{}{"inPartnerIds": partnerIds, "inPartnerCategory": domain.Career}); e == nil {
171 Statistics["careerCount"] = count 166 Statistics["careerCount"] = count
172 } 167 }
@@ -195,11 +190,6 @@ func getStatistics(userId int64, transactionContext *transaction.TransactionCont @@ -195,11 +190,6 @@ func getStatistics(userId int64, transactionContext *transaction.TransactionCont
195 Statistics["appOrdersMoney"] = bonus.TotalOrderAmount 190 Statistics["appOrdersMoney"] = bonus.TotalOrderAmount
196 Statistics["appDividend"] = bonus.Bonus 191 Statistics["appDividend"] = bonus.Bonus
197 } 192 }
198 - //if businessBonus, e := BusinessBonusDao.OrderBonusStatics(domain.OrderBonusQuery{InPartnerIds: partnerIds, IsDisable: 1}); e == nil {  
199 - // Statistics["businessDividend"] = businessBonus.Bonus  
200 - // Statistics["businessOrdersMoney"] = businessBonus.TotalOrderAmount  
201 - //}  
202 -  
203 Statistics["totalCount"] = len(partnerIds) 193 Statistics["totalCount"] = len(partnerIds)
204 return Statistics, nil 194 return Statistics, nil
205 } 195 }
@@ -32,6 +32,7 @@ type OrderBonusQuery struct { @@ -32,6 +32,7 @@ type OrderBonusQuery struct {
32 OrderType int `json:"orderType,omitempty"` 32 OrderType int `json:"orderType,omitempty"`
33 OrderTypes []int `json:"orderTypes,omitempty"` 33 OrderTypes []int `json:"orderTypes,omitempty"`
34 PartnerCategoryId int `json:"partnerCategoryId,omitempty"` //订单所属类型 34 PartnerCategoryId int `json:"partnerCategoryId,omitempty"` //订单所属类型
  35 + //IsGroupByPartnerCategoryId bool `json:"isGroupByPartnerCategoryId,omitempty"`
35 } 36 }
36 37
37 // 订单分红统计-应答 38 // 订单分红统计-应答
@@ -44,4 +45,5 @@ type OrderBonusResponse struct { @@ -44,4 +45,5 @@ type OrderBonusResponse struct {
44 BonusExpense float64 `json:"bonusExpense,omitempty"` 45 BonusExpense float64 `json:"bonusExpense,omitempty"`
45 // 订单金额 46 // 订单金额
46 TotalOrderAmount float64 `json:"totalOrderAmount"` 47 TotalOrderAmount float64 `json:"totalOrderAmount"`
  48 + //PartnerCategory *PartnerCategoryInfo
47 } 49 }
@@ -62,6 +62,7 @@ func (dao *OrderBaseDao) OrderBonusStatics(option domain.OrderBonusQuery) (rsp d @@ -62,6 +62,7 @@ func (dao *OrderBaseDao) OrderBonusStatics(option domain.OrderBonusQuery) (rsp d
62 q.ColumnExpr("sum((case when use_order_count>=0 then use_partner_bonus else plan_partner_bonus end)) bonus") 62 q.ColumnExpr("sum((case when use_order_count>=0 then use_partner_bonus else plan_partner_bonus end)) bonus")
63 q.ColumnExpr("sum(partner_bonus_expense) bonus_expense") 63 q.ColumnExpr("sum(partner_bonus_expense) bonus_expense")
64 q.ColumnExpr("sum(plan_order_amount) total_order_amount") 64 q.ColumnExpr("sum(plan_order_amount) total_order_amount")
  65 + //q.ColumnExpr("partner_category")
65 if option.PartnerId > 0 { 66 if option.PartnerId > 0 {
66 q.Where(`"order_base".partner_id =?`, option.PartnerId) 67 q.Where(`"order_base".partner_id =?`, option.PartnerId)
67 } 68 }
@@ -80,6 +81,9 @@ func (dao *OrderBaseDao) OrderBonusStatics(option domain.OrderBonusQuery) (rsp d @@ -80,6 +81,9 @@ func (dao *OrderBaseDao) OrderBonusStatics(option domain.OrderBonusQuery) (rsp d
80 if option.PartnerCategoryId > 0 { 81 if option.PartnerCategoryId > 0 {
81 q.Where(`"order_base".partner_category @>'{"id":?}'`, option.PartnerCategoryId) 82 q.Where(`"order_base".partner_category @>'{"id":?}'`, option.PartnerCategoryId)
82 } 83 }
  84 + //if option.IsGroupByPartnerCategoryId{
  85 + // q.Group(`partner_category`)
  86 + //}
83 err = q.Select(&rsp.Total, &rsp.Bonus, &rsp.BonusExpense, &rsp.TotalOrderAmount) 87 err = q.Select(&rsp.Total, &rsp.Bonus, &rsp.BonusExpense, &rsp.TotalOrderAmount)
84 return 88 return
85 } 89 }