作者 唐旭辉

修复: 在值未修改的情况下,保存操作后取消记录分红处理日志

@@ -111,6 +111,7 @@ func (serve *OrderBonusService) UpdateBounsByGoodNumber(orderId int64, adminId i @@ -111,6 +111,7 @@ func (serve *OrderBonusService) UpdateBounsByGoodNumber(orderId int64, adminId i
111 if err != nil { 111 if err != nil {
112 return lib.ThrowError(lib.INTERNAL_SERVER_ERROR, "更新订单数据失败,"+err.Error()) 112 return lib.ThrowError(lib.INTERNAL_SERVER_ERROR, "更新订单数据失败,"+err.Error())
113 } 113 }
  114 + if formerNumber != goodWithNumber {
114 // 事件发布 115 // 事件发布
115 modifyEvent := event.UpdateBonusByGoodNumber{ 116 modifyEvent := event.UpdateBonusByGoodNumber{
116 OrderId: oldOrder.Id, 117 OrderId: oldOrder.Id,
@@ -125,6 +126,7 @@ func (serve *OrderBonusService) UpdateBounsByGoodNumber(orderId int64, adminId i @@ -125,6 +126,7 @@ func (serve *OrderBonusService) UpdateBounsByGoodNumber(orderId int64, adminId i
125 if err = serve.Publish(modifyEvent); err != nil { 126 if err = serve.Publish(modifyEvent); err != nil {
126 return err 127 return err
127 } 128 }
  129 + }
128 return nil 130 return nil
129 } 131 }
130 132
@@ -360,6 +362,7 @@ func (serve *OrderBonusService) UpdateOrderRemarkBonus(orderId int64, adminId in @@ -360,6 +362,7 @@ func (serve *OrderBonusService) UpdateOrderRemarkBonus(orderId int64, adminId in
360 if err != nil { 362 if err != nil {
361 return fmt.Errorf("更新订单数据失败,%s", err) 363 return fmt.Errorf("更新订单数据失败,%s", err)
362 } 364 }
  365 + if formerRemark != remark {
363 //事件发布 366 //事件发布
364 modifyEvent := event.UpdateOrderRemark{ 367 modifyEvent := event.UpdateOrderRemark{
365 OrderId: oldOrder.Id, 368 OrderId: oldOrder.Id,
@@ -370,5 +373,7 @@ func (serve *OrderBonusService) UpdateOrderRemarkBonus(orderId int64, adminId in @@ -370,5 +373,7 @@ func (serve *OrderBonusService) UpdateOrderRemarkBonus(orderId int64, adminId in
370 if err = serve.Publish(modifyEvent); err != nil { 373 if err = serve.Publish(modifyEvent); err != nil {
371 return err 374 return err
372 } 375 }
  376 + }
  377 +
373 return nil 378 return nil
374 } 379 }