Merge branch 'pro' into dev
# Conflicts: # internal/biz/multi.go
This commit is contained in:
commit
001223b325
|
|
@ -80,7 +80,7 @@ func (biz *MultiBiz) Notify(ctx context.Context, ip, source string, req *bo.Wech
|
|||
}
|
||||
|
||||
if order.ActivityId == "" {
|
||||
return fmt.Errorf("批次活动ID不为空,不是多笔立减金,请检查")
|
||||
return fmt.Errorf("批次活动ID为空,不是多笔立减金,请检查")
|
||||
}
|
||||
|
||||
if err = biz.Run(ctx, ip, source, req, order); err != nil {
|
||||
|
|
|
|||
Loading…
Reference in New Issue