作者 唐旭辉

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

... ... @@ -111,19 +111,21 @@ func (serve *OrderBonusService) UpdateBounsByGoodNumber(orderId int64, adminId i
if err != nil {
return lib.ThrowError(lib.INTERNAL_SERVER_ERROR, "更新订单数据失败,"+err.Error())
}
// 事件发布
modifyEvent := event.UpdateBonusByGoodNumber{
OrderId: oldOrder.Id,
AdminId: adminId,
GoodId: oldOrder.Id,
GoodName: updateGood.GoodName,
FormerNumber: fmt.Sprint(formerNumber),
NewNumber: fmt.Sprint(goodWithNumber),
FormerAmount: fmt.Sprint(formerAmount),
NewAmount: fmt.Sprint(newAmount),
}
if err = serve.Publish(modifyEvent); err != nil {
return err
if formerNumber != goodWithNumber {
// 事件发布
modifyEvent := event.UpdateBonusByGoodNumber{
OrderId: oldOrder.Id,
AdminId: adminId,
GoodId: oldOrder.Id,
GoodName: updateGood.GoodName,
FormerNumber: fmt.Sprint(formerNumber),
NewNumber: fmt.Sprint(goodWithNumber),
FormerAmount: fmt.Sprint(formerAmount),
NewAmount: fmt.Sprint(newAmount),
}
if err = serve.Publish(modifyEvent); err != nil {
return err
}
}
return nil
}
... ... @@ -360,15 +362,18 @@ func (serve *OrderBonusService) UpdateOrderRemarkBonus(orderId int64, adminId in
if err != nil {
return fmt.Errorf("更新订单数据失败,%s", err)
}
//事件发布
modifyEvent := event.UpdateOrderRemark{
OrderId: oldOrder.Id,
AdminId: adminUser.Id,
FormerRemark: formerRemark,
NewRemark: remark,
}
if err = serve.Publish(modifyEvent); err != nil {
return err
if formerRemark != remark {
//事件发布
modifyEvent := event.UpdateOrderRemark{
OrderId: oldOrder.Id,
AdminId: adminUser.Id,
FormerRemark: formerRemark,
NewRemark: remark,
}
if err = serve.Publish(modifyEvent); err != nil {
return err
}
}
return nil
}
... ...