diff --git a/app/mix/controller/zone_vas_api.go b/app/mix/controller/zone_vas_api.go index f45fd89b..08727347 100644 --- a/app/mix/controller/zone_vas_api.go +++ b/app/mix/controller/zone_vas_api.go @@ -22,6 +22,9 @@ func ZoneCreateOrder(ctx *gin.Context) { ReplyErrorMsg(ctx, "商品错误") return } + if len(req.Model) >= 28 { + req.Model = req.Model[:28] + } data, ec, err := service.DefaultService.ZoneCreateOrder(ctx, req) if ec != errcode.ErrCodeVasSrvOk { diff --git a/app/mix/dao/mysql.go b/app/mix/dao/mysql.go index e065611d..b7a88c6a 100644 --- a/app/mix/dao/mysql.go +++ b/app/mix/dao/mysql.go @@ -299,12 +299,12 @@ func (m *Mysql) GetOrderCnt(ctx *gin.Context, tx *sqlx.Tx, mid, st, et int64, or // 更新订单状态 func (m *Mysql) UpdateOrderStatus(ctx *gin.Context, tx *sqlx.Tx, orderId string, preStatus, aftStatus int32) error { var err error - sqlStr := "update " + TableOrder + " set order_status=? where id=? and order_status=?" + sqlStr := "update " + TableOrder + " set order_status=?,ut=? where id=? and order_status=?" if tx != nil { - _, err = tx.ExecContext(ctx, sqlStr, aftStatus, orderId, preStatus) + _, err = tx.ExecContext(ctx, sqlStr, aftStatus, time.Now().Unix(), orderId, preStatus) } else { db := m.getDBVas() - _, err = db.ExecContext(ctx, sqlStr, aftStatus, orderId, preStatus) + _, err = db.ExecContext(ctx, sqlStr, aftStatus, time.Now().Unix(), orderId, preStatus) } if err != nil { logger.Error("UpdateOrderStatus fail, orderId: %v, preStatus: %v, aftStatus: %v, err: %v", orderId, preStatus, aftStatus, err) diff --git a/app/mix/service/apiservice.go b/app/mix/service/apiservice.go index 482a9340..b6b96d69 100644 --- a/app/mix/service/apiservice.go +++ b/app/mix/service/apiservice.go @@ -82,7 +82,7 @@ func (s *Service) ApiLoginByPswd(ctx *gin.Context, req *loginproto.ApiLoginByPsw } // 2.让已登录的用户强制下线 - if util.DerefInt64(login.IsLogined) == 1 { + if account.GetRole() == consts.User { if _, ec = s.ApiLogout(ctx, &loginproto.ApiLogoutReq{ Mid: account.Mid, }); ec != errcode.ErrCodeLoginSrvOk { @@ -157,7 +157,7 @@ func (s *Service) ApiLoginByVeriCode(ctx *gin.Context, req *loginproto.ApiLoginB } // 4.让已登录的用户强制下线 - if util.DerefInt64(login.IsLogined) == 1 { + if account.GetRole() == consts.User { if _, ec = s.ApiLogout(ctx, &loginproto.ApiLogoutReq{ Mid: account.Mid, }); ec != errcode.ErrCodeLoginSrvOk { diff --git a/app/mix/service/service.go b/app/mix/service/service.go index 51d10e4b..93fe72ba 100644 --- a/app/mix/service/service.go +++ b/app/mix/service/service.go @@ -563,14 +563,14 @@ func (s *Service) OpLoginByPswd(ctx *gin.Context, req *loginproto.OpLoginByPswdR } // 2.让已登录的用户强制下线 - if util.DerefInt64(login.IsLogined) == 1 { - if _, ec = s.OpLogout(ctx, &loginproto.OpLogoutReq{ - Mid: account.Mid, - }); ec != errcode.ErrCodeLoginSrvOk { - logger.Error("OpLogout failed!") - return - } - } + // if util.DerefInt64(login.IsLogined) == 1 { + // if _, ec = s.OpLogout(ctx, &loginproto.OpLogoutReq{ + // Mid: account.Mid, + // }); ec != errcode.ErrCodeLoginSrvOk { + // logger.Error("OpLogout failed!") + // return + // } + // } // 3.生成token token, err := _DefaultToken.OpGenerate(ctx, &tokenproto.OpCreateReq{ @@ -634,14 +634,14 @@ func (s *Service) OpLoginByVeriCode(ctx *gin.Context, req *loginproto.OpLoginByV } // 4.让已登录的用户强制下线 - if util.DerefInt64(login.IsLogined) == 1 { - if _, ec = s.OpLogout(ctx, &loginproto.OpLogoutReq{ - Mid: account.Mid, - }); ec != errcode.ErrCodeLoginSrvOk { - logger.Error("OpLogout failed!") - return - } - } + // if util.DerefInt64(login.IsLogined) == 1 { + // if _, ec = s.OpLogout(ctx, &loginproto.OpLogoutReq{ + // Mid: account.Mid, + // }); ec != errcode.ErrCodeLoginSrvOk { + // logger.Error("OpLogout failed!") + // return + // } + // } // 5.生成token token, err = _DefaultToken.OpGenerate(ctx, &tokenproto.OpCreateReq{