作者 唐旭辉

bug 修复

@@ -3,7 +3,7 @@ package domain @@ -3,7 +3,7 @@ package domain
3 import "errors" 3 import "errors"
4 4
5 //类型为(orderType=OrderTypeBestShop) 海鲜干货的订单分红 5 //类型为(orderType=OrderTypeBestShop) 海鲜干货的订单分红
6 -//因页面上的对于该类型的订单分红处理方式 有别于原有的其他类型(OrderReal),所以单独提取出来 6 +//因页面上的对于该类型的订单分红状态处理方式 有别于原有的其他类型(OrderReal),所以单独提取出来
7 7
8 // OrderGoodWithBestshopBonusStatus 支付状态 8 // OrderGoodWithBestshopBonusStatus 支付状态
9 type OrderGoodWithBestshopBonusStatus interface { 9 type OrderGoodWithBestshopBonusStatus interface {
@@ -54,12 +54,16 @@ var _ OrderGoodWithBestshopBonusStatus = (*OrderGoodBonusBestshopWaitPay)(nil) @@ -54,12 +54,16 @@ var _ OrderGoodWithBestshopBonusStatus = (*OrderGoodBonusBestshopWaitPay)(nil)
54 54
55 func (waitPay OrderGoodBonusBestshopWaitPay) UpdateOrderGoodNumber(good *OrderGood, number int) error { 55 func (waitPay OrderGoodBonusBestshopWaitPay) UpdateOrderGoodNumber(good *OrderGood, number int) error {
56 good.UseGoodNumber = number 56 good.UseGoodNumber = number
57 - return nil 57 + //待支付状态计算
  58 + err := good.CurrentBonusStatus.WartPayPartnerBonus(good)
  59 + return err
58 } 60 }
59 61
60 func (waitPay OrderGoodBonusBestshopWaitPay) UpdatePertnerBonusPercent(good *OrderGood, percent float64) error { 62 func (waitPay OrderGoodBonusBestshopWaitPay) UpdatePertnerBonusPercent(good *OrderGood, percent float64) error {
61 good.PartnerBonusPercent = percent 63 good.PartnerBonusPercent = percent
62 - return nil 64 + //待支付状态计算
  65 + err := good.CurrentBonusStatus.WartPayPartnerBonus(good)
  66 + return err
63 } 67 }
64 68
65 //OrderGoodBonusBestshopHasPay 货品支付状态:已支付 69 //OrderGoodBonusBestshopHasPay 货品支付状态:已支付
@@ -225,6 +225,10 @@ func (serve *OrderBonusService) UpdateBounsByPartnerBonusPercent(orderId int64, @@ -225,6 +225,10 @@ func (serve *OrderBonusService) UpdateBounsByPartnerBonusPercent(orderId int64,
225 FormerPartnerBonus: fmt.Sprint(formerPartnerBonus), 225 FormerPartnerBonus: fmt.Sprint(formerPartnerBonus),
226 NewPartnerBonus: fmt.Sprint(newPartnerBonus), 226 NewPartnerBonus: fmt.Sprint(newPartnerBonus),
227 } 227 }
  228 + if formerPartnerBonusPercent < 0 {
  229 + modifyEvent.FormerPartnerBonus = "-"
  230 + modifyEvent.FormerPartnerBonusPercent = "-"
  231 + }
228 if err = serve.Publish(modifyEvent); err != nil { 232 if err = serve.Publish(modifyEvent); err != nil {
229 return err 233 return err
230 } 234 }