作者 唐旭辉

修复:bug-28

@@ -664,7 +664,7 @@ func (service OrderInfoService) PageListOrderBonus(listOrderQuery query.ListOrde @@ -664,7 +664,7 @@ func (service OrderInfoService) PageListOrderBonus(listOrderQuery query.ListOrde
664 ) 664 )
665 goods, _, err = orderGoodRepository.Find(domain.OrderGoodFindQuery{OrderId: orders[i].Id}) 665 goods, _, err = orderGoodRepository.Find(domain.OrderGoodFindQuery{OrderId: orders[i].Id})
666 for ii := range goods { 666 for ii := range goods {
667 - if goods[ii].PartnerBonusPercent > 0 { 667 + if goods[ii].PartnerBonusPercent >= 0 {
668 hasBonusPercent = true 668 hasBonusPercent = true
669 } 669 }
670 } 670 }
@@ -2,6 +2,7 @@ package domain @@ -2,6 +2,7 @@ package domain
2 2
3 import ( 3 import (
4 "errors" 4 "errors"
  5 + "fmt"
5 6
6 "github.com/shopspring/decimal" 7 "github.com/shopspring/decimal"
7 ) 8 )
@@ -112,6 +113,9 @@ func (good OrderGood) GetCurrentPartnerBonus() float64 { @@ -112,6 +113,9 @@ func (good OrderGood) GetCurrentPartnerBonus() float64 {
112 113
113 //GetCurrentAmount 获取当前的商品合伙人分红 114 //GetCurrentAmount 获取当前的商品合伙人分红
114 func (good *OrderGood) ModifyOrderGoodNumber(number int, orderType int) error { 115 func (good *OrderGood) ModifyOrderGoodNumber(number int, orderType int) error {
  116 + if good.PlanGoodNumber < number {
  117 + return fmt.Errorf("修改数量不能大于初始值:%d", good.PlanGoodNumber)
  118 + }
115 err := good.CurrentBonusStatus.ModifyOrderGoodNumber(good, number, orderType) 119 err := good.CurrentBonusStatus.ModifyOrderGoodNumber(good, number, orderType)
116 return err 120 return err
117 } 121 }