diff --git a/services/express/internal/logic/expressDeliveringLogic.go b/services/express/internal/logic/expressDeliveringLogic.go index 83d0258..fc71c91 100644 --- a/services/express/internal/logic/expressDeliveringLogic.go +++ b/services/express/internal/logic/expressDeliveringLogic.go @@ -325,12 +325,12 @@ func (l *ExpressDeliveringLogic) cancel(client transit.Transit, w modelbase.Para info.OrderSn = utils.StringEmpty info.Status = status info.Express = utils.StringEmpty - mobdelObj := model.DeliveryOrderModel{}.Init() - mobdelObj.Begin() - _, err := mobdelObj.Edit(w, &info) + modelObj := model.DeliveryOrderModel{}.Init() + modelObj.Begin() + _, err := modelObj.Edit(w, &info) err = model.DeliveryHistoryModel{}.Init().Create(&history) if err != nil { - mobdelObj.Rollback() + modelObj.Rollback() l.Logger.Error("cancel up order err ", info.Id, err) return } @@ -341,19 +341,19 @@ func (l *ExpressDeliveringLogic) cancel(client transit.Transit, w modelbase.Para } _, err = model.DeliveryOrderExpModel{}.Init().Edit(ww, &editExp) if err != nil { - mobdelObj.Rollback() + modelObj.Rollback() l.Logger.Error("cancel up order err ", info.Id, err) return } if info.Type == dao.DeliveryTypeOrder { uSt := l.updateOrderDeliverStatus(info.ObjId, int32(status)) if uSt != utils.Ok { - mobdelObj.Rollback() + modelObj.Rollback() l.Logger.Error("cancel update order status err ", info.ObjId, status) return } } - mobdelObj.Commit() + modelObj.Commit() } func (l *ExpressDeliveringLogic) updateOrderDeliverStatus(id string, status int32) utils.Status { diff --git a/services/lonelog/internal/logic/itemslogic.go b/services/lonelog/internal/logic/itemslogic.go index 727a115..5b3421f 100644 --- a/services/lonelog/internal/logic/itemslogic.go +++ b/services/lonelog/internal/logic/itemslogic.go @@ -36,6 +36,7 @@ func (l *ItemsLogic) Items(in *lonelog.ItemsRequest) (*lonelog.Response, error) Size: int(in.Size), Order: "id desc", } + // 查询条件 w.Like = make(map[string]string) eq := make(map[string]string) w.Other = make(map[string]string)