作者 唐旭辉

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

@@ -111,19 +111,21 @@ func (serve *OrderBonusService) UpdateBounsByGoodNumber(orderId int64, adminId i @@ -111,19 +111,21 @@ 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 - // 事件发布  
115 - modifyEvent := event.UpdateBonusByGoodNumber{  
116 - OrderId: oldOrder.Id,  
117 - AdminId: adminId,  
118 - GoodId: oldOrder.Id,  
119 - GoodName: updateGood.GoodName,  
120 - FormerNumber: fmt.Sprint(formerNumber),  
121 - NewNumber: fmt.Sprint(goodWithNumber),  
122 - FormerAmount: fmt.Sprint(formerAmount),  
123 - NewAmount: fmt.Sprint(newAmount),  
124 - }  
125 - if err = serve.Publish(modifyEvent); err != nil {  
126 - return err 114 + if formerNumber != goodWithNumber {
  115 + // 事件发布
  116 + modifyEvent := event.UpdateBonusByGoodNumber{
  117 + OrderId: oldOrder.Id,
  118 + AdminId: adminId,
  119 + GoodId: oldOrder.Id,
  120 + GoodName: updateGood.GoodName,
  121 + FormerNumber: fmt.Sprint(formerNumber),
  122 + NewNumber: fmt.Sprint(goodWithNumber),
  123 + FormerAmount: fmt.Sprint(formerAmount),
  124 + NewAmount: fmt.Sprint(newAmount),
  125 + }
  126 + if err = serve.Publish(modifyEvent); err != nil {
  127 + return err
  128 + }
127 } 129 }
128 return nil 130 return nil
129 } 131 }
@@ -360,15 +362,18 @@ func (serve *OrderBonusService) UpdateOrderRemarkBonus(orderId int64, adminId in @@ -360,15 +362,18 @@ 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 }
363 - //事件发布  
364 - modifyEvent := event.UpdateOrderRemark{  
365 - OrderId: oldOrder.Id,  
366 - AdminId: adminUser.Id,  
367 - FormerRemark: formerRemark,  
368 - NewRemark: remark,  
369 - }  
370 - if err = serve.Publish(modifyEvent); err != nil {  
371 - return err 365 + if formerRemark != remark {
  366 + //事件发布
  367 + modifyEvent := event.UpdateOrderRemark{
  368 + OrderId: oldOrder.Id,
  369 + AdminId: adminUser.Id,
  370 + FormerRemark: formerRemark,
  371 + NewRemark: remark,
  372 + }
  373 + if err = serve.Publish(modifyEvent); err != nil {
  374 + return err
  375 + }
372 } 376 }
  377 +
373 return nil 378 return nil
374 } 379 }