mmm-go / partner · 提交

转到一个项目

作者 yangfu
提交 4347ded678e0b9be4448e9731cb71c7374caa485 1 个父辈 b1eed02b

订单详情/列表修改

内嵌 并排对比
正在显示 4 个修改的文件 包含 30 行增加 和 23 行删除
@@ -15,8 +15,8 @@ func DividendStatistics(header *protocol.RequestHeader, request *protocol.Divide @@ -15,8 +15,8 @@ func DividendStatistics(header *protocol.RequestHeader, request *protocol.Divide
15 var ( 15 var (
16 transactionContext, _ = factory.CreateTransactionContext(nil) 16 transactionContext, _ = factory.CreateTransactionContext(nil)
17 OrderResponsitory, _ = factory.CreateOrderRepository(transactionContext) 17 OrderResponsitory, _ = factory.CreateOrderRepository(transactionContext)
18 - beginTime = time.Unix(request.StartTime/1000, 0)  
19 - endTime = time.Unix(request.EndTime/1000, 0) 18 + //beginTime = time.Unix(request.StartTime/1000, 0)
  19 + //endTime = time.Unix(request.EndTime/1000, 0)
20 ) 20 )
21 if err = transactionContext.StartTransaction(); err != nil { 21 if err = transactionContext.StartTransaction(); err != nil {
22 return nil, err 22 return nil, err
@@ -26,16 +26,16 @@ func DividendStatistics(header *protocol.RequestHeader, request *protocol.Divide @@ -26,16 +26,16 @@ func DividendStatistics(header *protocol.RequestHeader, request *protocol.Divide
26 }() 26 }()
27 _, orderAll, e := OrderResponsitory.Find(utils.ObjectJsonToMap(domain.OrderQueryOption{PartnerId: header.UserId, EndTime: time.Now(), SortByCreateTime: domain.DESC})) 27 _, orderAll, e := OrderResponsitory.Find(utils.ObjectJsonToMap(domain.OrderQueryOption{PartnerId: header.UserId, EndTime: time.Now(), SortByCreateTime: domain.DESC}))
28 if e != nil { 28 if e != nil {
29 - log.Error(e, beginTime, endTime) 29 + log.Error(e)
30 } 30 }
31 var orderBetween []*domain.Order 31 var orderBetween []*domain.Order
32 for i := range orderAll { 32 for i := range orderAll {
33 - if orderAll[i].CreateAt.After(beginTime) && orderAll[i].CreateAt.Before(endTime) { 33 + if orderAll[i].CreateAt.Unix() >= (request.StartTime/1000) && orderAll[i].CreateAt.Unix() < (request.EndTime/1000) {
34 orderBetween = append(orderBetween, orderAll[i]) 34 orderBetween = append(orderBetween, orderAll[i])
35 } 35 }
36 } 36 }
37 - bonusAll := AllBonusStatics(orderAll, request.DividendAction)  
38 - bonusQuarters := QuartersBonusStatics(orderBetween, request.DividendAction) 37 + bonusAll := AllBonusStatics(orderAll, 0)
  38 + bonusQuarters := QuartersBonusStatics(orderBetween, 0)
39 rsp = &protocol.DividendStatisticsResponse{} 39 rsp = &protocol.DividendStatisticsResponse{}
40 rsp.Statistics = protocol.DividendStatistics{ 40 rsp.Statistics = protocol.DividendStatistics{
41 Received: bonusAll.Received, 41 Received: bonusAll.Received,
@@ -51,13 +51,13 @@ func AllBonusStatics(orders []*domain.Order, action int) (bonus protocol.Bonus) @@ -51,13 +51,13 @@ func AllBonusStatics(orders []*domain.Order, action int) (bonus protocol.Bonus)
51 bonus = protocol.Bonus{} 51 bonus = protocol.Bonus{}
52 for i := range orders { 52 for i := range orders {
53 o := orders[i] 53 o := orders[i]
54 - if action == protocol.BonusTotal {  
55 - bonus.Received += o.OrderBonusReceive()  
56 - bonus.Outstanding += o.OrderBonusWait()  
57 - }  
58 - if action == protocol.BonusOutstanding {  
59 - bonus.Outstanding += o.OrderBonusOutstanding()  
60 - } 54 + //if action == protocol.BonusTotal {
  55 + bonus.Received += o.OrderBonusReceive()
  56 + bonus.Outstanding += o.OrderBonusWait()
  57 + //}
  58 + //if action == protocol.BonusOutstanding {
  59 + // bonus.Outstanding += o.OrderBonusOutstanding()
  60 + //}
61 } 61 }
62 return 62 return
63 } 63 }
@@ -68,13 +68,16 @@ func QuartersBonusStatics(orders []*domain.Order, action int) (bonus []protocol. @@ -68,13 +68,16 @@ func QuartersBonusStatics(orders []*domain.Order, action int) (bonus []protocol.
68 for i := range orders { 68 for i := range orders {
69 o := orders[i] 69 o := orders[i]
70 quarter := o.CreateAt.Month() / 4 70 quarter := o.CreateAt.Month() / 4
71 - if action == protocol.BonusTotal {  
72 - bonus[quarter].Received += o.OrderBonusReceive()  
73 - bonus[quarter].Outstanding += o.OrderBonusWait()  
74 - }  
75 - if action == protocol.BonusOutstanding {  
76 - bonus[quarter].Expend += o.OrderBonusOutstanding()  
77 - } 71 + bonus[quarter].Received += o.OrderBonusReceive()
  72 + bonus[quarter].Outstanding += o.OrderBonusWait()
  73 + bonus[quarter].Expend += o.OrderBonusOutstanding()
  74 + //if action == protocol.BonusTotal {
  75 + //bonus[quarter].Received += o.OrderBonusReceive()
  76 + //bonus[quarter].Outstanding += o.OrderBonusWait()
  77 + //}
  78 + //if action == protocol.BonusOutstanding {
  79 + //bonus[quarter].Expend += o.OrderBonusOutstanding()
  80 + //}
78 } 81 }
79 return 82 return
80 } 83 }
@@ -50,8 +50,8 @@ func OrderDetail(header *protocol.RequestHeader, request *protocol.OrderDetailRe @@ -50,8 +50,8 @@ func OrderDetail(header *protocol.RequestHeader, request *protocol.OrderDetailRe
50 OrderStatus: order.OrderStatus, 50 OrderStatus: order.OrderStatus,
51 CreateTime: order.CreateAt.Unix() * 1000, 51 CreateTime: order.CreateAt.Unix() * 1000,
52 UpdateTime: order.UpdateAt.Unix() * 1000, 52 UpdateTime: order.UpdateAt.Unix() * 1000,
53 - OrderQuantity: order.OrderCount,  
54 - OrderAmount: order.OrderAmount, 53 + OrderQuantity: order.OrderActualCount,
  54 + OrderAmount: order.OrderActualAmount,
55 OrderAmountCancel: order.OrderAmountCancel(), 55 OrderAmountCancel: order.OrderAmountCancel(),
56 OrderDistrict: map[string]interface{}{"id": order.OrderRegionInfo.RegionId, "name": order.OrderRegionInfo.RegionName}, 56 OrderDistrict: map[string]interface{}{"id": order.OrderRegionInfo.RegionId, "name": order.OrderRegionInfo.RegionName},
57 Customer: protocol.Customer{Uname: order.Buyer.BuyerName, Phone: order.Buyer.ContactInfo}, 57 Customer: protocol.Customer{Uname: order.Buyer.BuyerName, Phone: order.Buyer.ContactInfo},
@@ -27,6 +27,10 @@ func (this *AuthController) Login() { @@ -27,6 +27,10 @@ func (this *AuthController) Login() {
27 msg = m 27 msg = m
28 return 28 return
29 } 29 }
  30 + if request.ClientId != clientId {
  31 + msg = protocol.NewResponseMessage(101, "clientId无效")
  32 + return
  33 + }
30 header := this.GetRequestHeader(this.Ctx) 34 header := this.GetRequestHeader(this.Ctx)
31 data, err := auth.Login(header, request) 35 data, err := auth.Login(header, request)
32 if err != nil { 36 if err != nil {
@@ -10,7 +10,7 @@ type DividendStatisticsRequest struct { @@ -10,7 +10,7 @@ type DividendStatisticsRequest struct {
10 StartTime int64 `json:"startTime" valid:"Required"` 10 StartTime int64 `json:"startTime" valid:"Required"`
11 EndTime int64 `json:"endTime" valid:"Required"` 11 EndTime int64 `json:"endTime" valid:"Required"`
12 //分红类型（0累计分红、1分红支出） 12 //分红类型（0累计分红、1分红支出）
13 - DividendAction int `json:"dividendAction"` 13 + //DividendAction int `json:"dividendAction"`
14 } 14 }
15 type DividendStatisticsResponse struct { 15 type DividendStatisticsResponse struct {
16 Statistics DividendStatistics `json:"statistics"` 16 Statistics DividendStatistics `json:"statistics"`